diff options
| author | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-03-02 10:22:56 +0100 |
|---|---|---|
| committer | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-03-02 10:22:56 +0100 |
| commit | ddfd09c09cb904529df567e5606d76c467ed856f (patch) | |
| tree | d17a48cf08e580cac866417700ea1ffe74c48bd7 /config/routes | |
| parent | 52c4a7866ed010d8db67e5ca976d8c73d4084784 (diff) | |
| parent | 3b3f0fab452fb9cbe4fbe7f75112bef3a7f9d039 (diff) | |
| download | gitlab-ce-ddfd09c09cb904529df567e5606d76c467ed856f.tar.gz | |
Merge branch 'master' into zj-create-mattermost-team
Diffstat (limited to 'config/routes')
| -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 |