Commit graph

8 commits

Author SHA1 Message Date
GitLab Bot
34b3567c97 Add latest changes from gitlab-org/gitlab@master 2019-11-19 09:06:16 +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
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
b8c1317152 Update merge options for auto merge strategies
Currently, merge options is updated on #execute method,
however, we should have #update interface to make it explicit.
2019-06-12 13:20:49 +07:00
Shinya Maeda
8f243acf02 Notify when auto merge is enabled
There are bunch of auto merge related notifications, and
when auto merge is enabled, it should be evaluated immediately.
2019-06-10 18:03:32 +07:00
Shinya Maeda
2a01b33e6a Create BaseService for Auto Merge architecture
It abstracts some codes for common methods in AutoMerge::*Services.
2019-06-06 10:36:02 +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