summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorOswaldo Ferreira <oswaldo@gitlab.com>2019-05-21 18:14:22 -0300
committerOswaldo Ferreira <oswaldo@gitlab.com>2019-06-20 11:48:30 -0300
commit3af348b6cf28ef1d9d3025f7012049132b57798c (patch)
tree540b724d6b711e3d2247dad5c371b54ec81ea610 /docker
parentc6eb18ee0fe1b887438da87f25fc2f2a852dd393 (diff)
downloadgitlab-ce-3af348b6cf28ef1d9d3025f7012049132b57798c.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 'docker')
0 files changed, 0 insertions, 0 deletions