diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-09-18 09:06:23 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-09-18 09:06:23 +0000 |
| commit | 2f594206e2f86e332b5d6ff0426ad966efef33b3 (patch) | |
| tree | 533f4396f31dd3d65820ca990bfde5f21d22c476 /app/services | |
| parent | d86bbe012644c672874ccd99d68847b751c4b635 (diff) | |
| parent | 902b5347dcbb8d93d5b055d89d8d0414fdeade74 (diff) | |
| download | gitlab-ce-2f594206e2f86e332b5d6ff0426ad966efef33b3.tar.gz | |
Merge branch 'operation-service-merge' into 'master'
Prepare Repository#merge for migration to Gitaly
Closes gitaly#559
See merge request gitlab-org/gitlab-ce!14154
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/merge_requests/merge_service.rb | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/app/services/merge_requests/merge_service.rb b/app/services/merge_requests/merge_service.rb index b2b6c5627fb..07cbd8f92a9 100644 --- a/app/services/merge_requests/merge_service.rb +++ b/app/services/merge_requests/merge_service.rb @@ -38,15 +38,9 @@ module MergeRequests private def commit - committer = repository.user_to_committer(current_user) + message = params[:commit_message] || merge_request.merge_commit_message - options = { - message: params[:commit_message] || merge_request.merge_commit_message, - author: committer, - committer: committer - } - - commit_id = repository.merge(current_user, source, merge_request, options) + commit_id = repository.merge(current_user, source, merge_request, message) raise MergeError, 'Conflicts detected during merge' unless commit_id |