diff options
| author | Jacob Vosmaer <jacob@gitlab.com> | 2017-09-08 14:00:53 +0200 |
|---|---|---|
| committer | Jacob Vosmaer <jacob@gitlab.com> | 2017-09-15 16:39:20 +0200 |
| commit | 902b5347dcbb8d93d5b055d89d8d0414fdeade74 (patch) | |
| tree | 5e7f71da382b231d5322539941ea4476ca44c6e2 /app/services | |
| parent | 2203e8fc35b12c19a9a0be1c2c63256047a3c5ff (diff) | |
| download | gitlab-ce-902b5347dcbb8d93d5b055d89d8d0414fdeade74.tar.gz | |
Prepare Repository#merge for migration to Gitalyoperation-service-merge
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 |