Download as
Browse Code »

Commit 8781459124b87912b105bab3c2b67c46f5457db9

Authored by Dmitriy Zaporozhets
1 parent db966364
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Use params[:merge_commit_message] in MergeRequestController for automerge 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 1 changed file with 1 additions and 1 deletions   Show diff stats
app/controllers/projects/merge_requests_controller.rb
  Diff comments   View file @8781459
... ... @@ -123,7 +123,7 @@ class Projects::MergeRequestsController &lt; Projects::ApplicationController
123 123  
124 124 if @merge_request.opened? && @merge_request.can_be_merged?
125 125 @merge_request.should_remove_source_branch = params[:should_remove_source_branch]
126   - @merge_request.automerge!(current_user)
  126 + @merge_request.automerge!(current_user, params[:merge_commit_message])
127 127 @status = true
128 128 else
129 129 @status = false
... ...