summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-05-13 12:26:42 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-05-13 12:26:42 +0300
commit0fd12a786af3d3fdc672b82ca76b7e0512efad7d (patch)
treed111ea12177ee2b8620b76094f478d074c1e5155 /app
parente0fdb4262aa8b5351fe55044b942f4ce595be25c (diff)
parenta3d8be09c6c62e39301d82e47b710717ff68245f (diff)
downloadgitlab-ce-0fd12a786af3d3fdc672b82ca76b7e0512efad7d.tar.gz
Merge pull request #6825 from sue445/feature/post_automerge
Fix can not automerge when description is too long
Diffstat (limited to 'app')
-rw-r--r--app/views/projects/merge_requests/show/_mr_accept.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/show/_mr_accept.html.haml b/app/views/projects/merge_requests/show/_mr_accept.html.haml
index 6594709f2ae..6ca801b17b9 100644
--- a/app/views/projects/merge_requests/show/_mr_accept.html.haml
+++ b/app/views/projects/merge_requests/show/_mr_accept.html.haml
@@ -12,7 +12,7 @@
- if @show_merge_controls
.automerge_widget.can_be_merged.hide
.clearfix
- = form_for [:automerge, @project, @merge_request], remote: true, method: :get do |f|
+ = form_for [:automerge, @project, @merge_request], remote: true, method: :post do |f|
%h4
You can accept this request automatically.
%div