summaryrefslogtreecommitdiff
path: root/qa
diff options
context:
space:
mode:
authorOswaldo Ferreira <oswaldo@gitlab.com>2019-05-21 18:14:22 -0300
committerOswaldo Ferreira <oswaldo@gitlab.com>2019-05-31 19:16:01 -0300
commitb965009ddddcd50e76841dbc97d2767292e88a0a (patch)
tree5c8e87e5c96454ee0cf918a5b7b878ee95d5ed4b /qa
parent15916ad55920ca582a9124f7f0737b0373432a99 (diff)
downloadgitlab-ce-b965009ddddcd50e76841dbc97d2767292e88a0a.tar.gz
Automatically update MR merge-ref along merge status
This couples the code that transitions the `MergeRequest#merge_status` and refs/merge-requests/:iid/merge ref update. In general, instead of directly telling `MergeToRefService` to update the merge ref, we should rely on `MergeabilityCheckService` to keep both the merge status and merge ref synced. Now, if the merge_status is `can_be_merged` it means the merge-ref is also updated to the latest. We've also updated the logic to be more systematic and less user-based.
Diffstat (limited to 'qa')
0 files changed, 0 insertions, 0 deletions