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
  • !14540

Clean merge_jid whenever necessary on the merge process

  • Review changes

  • Download
  • Email patches
  • Plain diff
Merged Oswaldo Ferreira requested to merge 38476-improve-merge-jid-cleanup-on-merge-process into master Sep 27, 2017
  • Overview 2
  • Commits 1
  • Pipelines 2
  • Changes 3

MergeRequest#merge_jid should be cleaned up whenever we hit a known error on MergeService#execute (or we finished processing). This way we can keep track if the MR is really "ongoing" or just "stuck" (stuck MRs are already being handled by StuckMergeJobsWorker).

Currently, if a an user clicks Merge and the MR is not mergeable, or no source is found, we keep stuck on merge ongoing state.

Backport https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3027

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](https://docs.gitlab.com/ee/development/merge_request_performance_guidelines.html)
  • Conform by the style guides
  • Squashed related commits together

What are the relevant issue numbers?

Closes #38476 (closed)

Edited Sep 28, 2017 by Oswaldo Ferreira
Assignee
Assign to
Reviewer
Request review from
Time tracking
Source branch: 38476-improve-merge-jid-cleanup-on-merge-process