summaryrefslogtreecommitdiff
path: root/config/routes.rb
diff options
context:
space:
mode:
Diffstat (limited to 'config/routes.rb')
-rw-r--r--config/routes.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/routes.rb b/config/routes.rb
index 0bc2c173453..49543786686 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -571,7 +571,7 @@ Gitlab::Application.routes.draw do
get :diffs
get :commits
post :merge
- get :merge_check
+ post :cancel_merge_when_build_succeeds
get :ci_status
post :toggle_subscription
end