Skip to content
GitLab Next
  • Menu
Projects Groups Snippets
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
  • GitLab FOSS GitLab FOSS
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Locked Files
  • Issues 0
    • Issues 0
    • List
    • Boards
    • Service Desk
    • Milestones
    • Iterations
    • Requirements
  • Merge requests 0
    • Merge requests 0
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages & Registries
    • Packages & Registries
    • Package Registry
    • Container Registry
    • Infrastructure Registry
  • Monitor
    • Monitor
    • Metrics
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • Code review
    • Insights
    • Issue
    • Repository
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Commits
  • Issue Boards
Collapse sidebar
  • GitLab.org
  • GitLab FOSSGitLab FOSS
  • Merge requests
  • !15069

Fix widget of locked merge requests not being presented

  • Review changes

  • Download
  • Email patches
  • Plain diff
Merged Oswaldo Ferreira requested to merge make-merge-jid-handling-less-stateful into master Oct 27, 2017
  • Overview 7
  • Commits 3
  • Pipelines 5
  • Changes 7

What does this MR do?

  1. Fixes the bug found in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15018#note_44888376
  2. Make MR merge_jid / unlocking less complex (by making it less stateful)

Why was this MR needed?

The MergeRequest locking issue still manifests in tricky ways when we try to:

  1. Cleanup the MergeRequest#merge_jid
  2. Unlock the merge request

The crux is that the merge_jid may be cleaned and the merge request remain locked. Therefore our unlocking worker can't find and update the state of the merge request, and as end result we may have the behavior in the screenshot below:

Screenshots (if relevant)

WhatsApp_Image_2017-10-23_at_13.31.06

Does this MR meet the acceptance criteria?

  • Changelog entry added, if necessary
  • Documentation created/updated
  • API support added
  • Tests added for this feature/bug
  • Review
    • Has been reviewed by Backend
  • Conform by the merge request performance guides
  • Conform by the style guides
  • Squashed related commits together

What are the relevant issue numbers?

Edited Oct 29, 2017 by Oswaldo Ferreira
Assignee
Assign to
Reviewer
Request review from
Time tracking
Source branch: make-merge-jid-handling-less-stateful