summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorJarka Kadlecova <kadlecovaj@gmail.com>2016-12-21 11:32:37 +0100
committerJarka Kadlecova <jarka@gitlab.com>2017-01-11 08:48:07 -0500
commitaa934c7469372cac7b8cd10b49761d90d8e367fa (patch)
tree23030a57551efe5340fa44b65241911f6cd0ab44 /config
parent7ab3dd4b302a85c1b005e9ef290ebac631cda673 (diff)
downloadgitlab-ce-aa934c7469372cac7b8cd10b49761d90d8e367fa.tar.gz
refresh merge widget after using /merge command
Diffstat (limited to 'config')
-rw-r--r--config/routes/project.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/config/routes/project.rb b/config/routes/project.rb
index 26e2dc9e6e7..1fc6ed28c74 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -94,6 +94,7 @@ constraints(ProjectUrlConstrainer.new) do
get :pipelines
get :merge_check
post :merge
+ get :merge_widget_refresh
post :cancel_merge_when_build_succeeds
get :ci_status
get :ci_environments_status