Skip to content

Update merge_status state to allow more transitions

DJ Mountney requested to merge perforce/gitlab-ce:merge-status-transition into master

Previously you could only transition from the unchecked state to one of the others. This meant that the mark_as_unmerged call in AutoMergeService would rarily be able to actually transition the state. As it would usually have already been set to can_be_merged before it hit that service.

Spec and Spinach tests have been run locally and all pass.

Merge request reports