GitLab Bot
63324f9cfd
Add latest changes from gitlab-org/gitlab@master
2020-10-21 15:10:28 +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
0ba3a054d2
Add latest changes from gitlab-org/gitlab@master
2020-01-10 09:07:49 +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
29a16fbf9e
Add auto merge strategies
...
AddToMergeTrainWhenPipelineSucceeds and MergeTrain
2019-06-12 18:28:40 +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
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
