Commit 8781459124b87912b105bab3c2b67c46f5457db9
1 parent
db966364
Exists in
spb-stable
and in
3 other branches
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
| @@ -123,7 +123,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController | @@ -123,7 +123,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController | ||
| 123 | 123 | ||
| 124 | if @merge_request.opened? && @merge_request.can_be_merged? | 124 | if @merge_request.opened? && @merge_request.can_be_merged? |
| 125 | @merge_request.should_remove_source_branch = params[:should_remove_source_branch] | 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 | @status = true | 127 | @status = true |
| 128 | else | 128 | else |
| 129 | @status = false | 129 | @status = false |