Commit Graph

13 Commits

Author SHA1 Message Date
GitLab Bot e40f19ef83 Add latest changes from gitlab-org/gitlab@master 2021-11-11 15:10:57 +00:00
GitLab Bot 9b09561f47 Add latest changes from gitlab-org/gitlab@master 2020-12-09 18:09:48 +00:00
GitLab Bot 57ac0bc8f7 Add latest changes from gitlab-org/gitlab@master 2020-09-01 00:10:35 +00:00
GitLab Bot d5cf5cf4f7 Add latest changes from gitlab-org/gitlab@master 2020-07-17 00:09:37 +00:00
GitLab Bot fa7ac2663b Add latest changes from gitlab-org/gitlab@master 2020-06-24 06:09:01 +00:00
GitLab Bot e33f87ac0f Add latest changes from gitlab-org/gitlab@master 2020-04-21 15:21:10 +00:00
GitLab Bot 8b1228b0d4 Add latest changes from gitlab-org/gitlab@master 2020-01-10 15:07:47 +00:00
GitLab Bot 4e516dbff9 Add latest changes from gitlab-org/gitlab@master 2019-11-13 12:06:22 +00:00
Bob Van Landuyt 20cb4f7ab5 Only assign merge params when allowed
When a user updates a merge request coming from a fork, they should
not be able to set `force_remove_source_branch` if they cannot push
code to the source project.

Otherwise developers of the target project could remove the source
branch of the source project by setting this flag through the API.
2019-10-24 12:19:56 +02:00
GitLab Bot b3e4ec8e8a Add latest changes from gitlab-org/gitlab@master 2019-10-23 09:06:03 +00:00
Shinya Maeda 587ffd1148 Split AutoMergeService interfaces into two `cancel` and `abort`
Create explicit endpoint - abort.
2019-07-05 13:19:30 +07:00
Shinya Maeda df3a0f2613 Fix MWPS system notes shows inconsistent sha
Fix the system note service
2019-07-04 13:26:39 +07:00
Shinya Maeda d4b4693663 Abstract auto merge processes
We have one auto merge strategy today - Merge When Pipeline
Succeeds.

In order to add more strategies for Merge Train feature,
we abstract the architecture to be more extensible.

Removed arguments

Fix spec
2019-06-03 13:15:29 +07:00