Commit graph

9 commits

Author SHA1 Message Date
GitLab Bot
4c5468b408 Add latest changes from gitlab-org/gitlab@master 2020-06-24 15:08:50 +00:00
GitLab Bot
5693fb6ba7 Add latest changes from gitlab-org/gitlab@master 2020-06-08 15:08:20 +00:00
GitLab Bot
77d15aff0e Add latest changes from gitlab-org/gitlab@master 2020-03-19 00:09:27 +00:00
GitLab Bot
aaf5961054 Add latest changes from gitlab-org/gitlab@master 2020-03-18 15:09:45 +00:00
GitLab Bot
d2798d607e Add latest changes from gitlab-org/gitlab@master 2019-09-16 12:06:26 +00:00
Oswaldo Ferreira
3af348b6cf 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.
2019-06-20 11:48:30 -03:00
Oswaldo Ferreira
00a273d3a9 Revert "Automatically update MR merge-ref along merge status" 2019-06-11 13:08:25 -03:00
Oswaldo Ferreira
4246a62118 Add payload to the service response
This introduces payload to the ServiceResponse with
the merge ref HEAD commit data
2019-05-31 19:16:01 -03:00
Lin Jen-Shin
a96507bf00 Introduce ServiceResponse to wrap around response
See https://gitlab.com/gitlab-org/gitlab-ce/issues/60730
2019-04-22 17:16:32 +08:00