summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorsue445 <sue445@sue445.net>2014-04-18 00:13:31 +0900
committersue445 <sue445@sue445.net>2014-05-11 23:50:14 +0900
commita3d8be09c6c62e39301d82e47b710717ff68245f (patch)
treef93561c0908a8314ebf2fd802a87808c06761085 /config
parent4ba5acd23826831d5db52e66db5238a9030264a3 (diff)
downloadgitlab-ce-a3d8be09c6c62e39301d82e47b710717ff68245f.tar.gz
Fix can not automerge if description is too long
Diffstat (limited to 'config')
-rw-r--r--config/routes.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/routes.rb b/config/routes.rb
index 7a33686b810..7641fe43088 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -273,7 +273,7 @@ Gitlab::Application.routes.draw do
resources :merge_requests, constraints: {id: /\d+/}, except: [:destroy] do
member do
get :diffs
- get :automerge
+ post :automerge
get :automerge_check
get :ci_status
end