Commit Graph

8 Commits

Author SHA1 Message Date
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 e33f87ac0f Add latest changes from gitlab-org/gitlab@master 2020-04-21 15:21:10 +00:00
GitLab Bot 34b3567c97 Add latest changes from gitlab-org/gitlab@master 2019-11-19 09:06:16 +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 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