diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-06-20 18:48:04 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2016-07-06 18:50:58 -0400 |
| commit | 6ce25e7b4caa9e94de74378729178c7060d640b2 (patch) | |
| tree | 8f7b7ba4d83d20bffe7bb50fba1942fd6c9c5b80 /app/services/merge_requests/merge_service.rb | |
| parent | 18a5bb05204ee437902d82e5973a427b9aac6d53 (diff) | |
| download | gitlab-ce-6ce25e7b4caa9e94de74378729178c7060d640b2.tar.gz | |
Rename MergeRequest methods that return commits or shas to be more clear and consistent
Diffstat (limited to 'app/services/merge_requests/merge_service.rb')
| -rw-r--r-- | app/services/merge_requests/merge_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/merge_requests/merge_service.rb b/app/services/merge_requests/merge_service.rb index 3bec66cea88..f1b1d90c457 100644 --- a/app/services/merge_requests/merge_service.rb +++ b/app/services/merge_requests/merge_service.rb @@ -34,7 +34,7 @@ module MergeRequests committer: committer } - commit_id = repository.merge(current_user, merge_request.source_sha, merge_request.target_branch, options) + commit_id = repository.merge(current_user, merge_request.diff_head_sha, merge_request.target_branch, options) merge_request.update(merge_commit_sha: commit_id) rescue GitHooksService::PreReceiveError => e merge_request.update(merge_error: e.message) |