GitLab Bot
b7dfe2ae40
Add latest changes from gitlab-org/gitlab@master
2019-09-13 13:26:31 +00:00
dineshpanda
ee1633e383
Avoid calling freeze on already frozen strings in app/services
2019-09-04 09:21:21 +05:30
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
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
