diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2019-05-22 18:45:27 +0700 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2019-06-03 13:15:29 +0700 |
| commit | d4b46936633a3b2a0248b4572b4a1dc7b2ba8531 (patch) | |
| tree | bf5c1cf5a8ebf1568ca62576d63ff793ce29764f /config | |
| parent | 96744d0befd7e298c08e6d20a4f504086a717c35 (diff) | |
| download | gitlab-ce-d4b46936633a3b2a0248b4572b4a1dc7b2ba8531.tar.gz | |
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
Diffstat (limited to 'config')
| -rw-r--r-- | config/routes/project.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/routes/project.rb b/config/routes/project.rb index 840dc4c7844..d44ff62bc2a 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -208,7 +208,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do member do get :commit_change_content post :merge - post :cancel_merge_when_pipeline_succeeds + post :cancel_auto_merge get :pipeline_status get :ci_environments_status post :toggle_subscription |