diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-03-01 23:30:51 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-03-01 23:30:51 +0300 |
| commit | 7e2ad5d47a1d95281e2a217538dae67107a584c2 (patch) | |
| tree | e86d3395d583d3bee5804aa09656a3e2db5e7d8b /config | |
| parent | a87815fbc07359d83918e1ff61961af174f76fe0 (diff) | |
| parent | a0101ebf84ed397899df8f3a017d2b25dc45db57 (diff) | |
Merge branch 'fix/mwbs-to-mwps' into 'master'
Rename MWBS to MWPS
Closes #24707
See merge request !9335
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 84f123ff717..94841639823 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -100,7 +100,7 @@ constraints(ProjectUrlConstrainer.new) do get :merge_check post :merge get :merge_widget_refresh - post :cancel_merge_when_build_succeeds + post :cancel_merge_when_pipeline_succeeds get :ci_status get :ci_environments_status post :toggle_subscription |