diff options
| author | Oswaldo Ferreira <oswaldo@gitlab.com> | 2019-05-21 18:14:22 -0300 |
|---|---|---|
| committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2019-05-31 19:16:01 -0300 |
| commit | b965009ddddcd50e76841dbc97d2767292e88a0a (patch) | |
| tree | 5c8e87e5c96454ee0cf918a5b7b878ee95d5ed4b /changelogs | |
| parent | 15916ad55920ca582a9124f7f0737b0373432a99 (diff) | |
| download | gitlab-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 'changelogs')
| -rw-r--r-- | changelogs/unreleased/osw-sync-merge-ref-upon-mergeability-check.yml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/osw-sync-merge-ref-upon-mergeability-check.yml b/changelogs/unreleased/osw-sync-merge-ref-upon-mergeability-check.yml new file mode 100644 index 00000000000..1f40089adb8 --- /dev/null +++ b/changelogs/unreleased/osw-sync-merge-ref-upon-mergeability-check.yml @@ -0,0 +1,5 @@ +--- +title: Sync merge ref upon mergeability check +merge_request: 28513 +author: +type: added |