diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-10-03 15:38:33 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-10-03 15:38:33 +0400 |
| commit | 43217dd5ddcb7557ea0c7300c6a02253f1b99d7d (patch) | |
| tree | b5a66c12afcc2341cfb7757b5895a0c4145d89e8 /app/controllers | |
| parent | 8188427e83f55df1f9750786c2a457976d4ebca7 (diff) | |
| parent | 4ebe718d69bc4a619f829ab54a81a6ed03cd56c1 (diff) | |
Merge branch 'cirosantilli-factor-commit-msg-textarea'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
app/views/projects/edit_tree/show.html.haml
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 16bb3a5476e..e13773d6465 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -122,7 +122,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController if @merge_request.open? && @merge_request.can_be_merged? @merge_request.should_remove_source_branch = params[:should_remove_source_branch] - @merge_request.automerge!(current_user, params[:merge_commit_message]) + @merge_request.automerge!(current_user, params[:commit_message]) @status = true else @status = false |