diff options
| author | Sean McGivern <sean@gitlab.com> | 2017-02-01 14:28:04 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2017-02-03 09:46:03 +0000 |
| commit | 7550f60ddeecebac3f84e8690ab3f42428600ff7 (patch) | |
| tree | f2121574ae7e46a2cc970f92a1287ad1289c4e5b /app/models | |
| parent | fd46fb1cd9cc1fdf826d31261aa594baa38d4898 (diff) | |
| download | gitlab-ce-7550f60ddeecebac3f84e8690ab3f42428600ff7.tar.gz | |
Backport changes from EE squash
Backport changes from the EE-only squash implementation, which would
otherwise conflict when merge CE into EE.
<https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1024>
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/repository.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb index a54d75f7019..7cf09c52bf4 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -913,11 +913,11 @@ class Repository end end - def merge(user, merge_request, options = {}) + def merge(user, source, merge_request, options = {}) GitOperationService.new(user, self).with_branch( merge_request.target_branch) do |start_commit| our_commit = start_commit.sha - their_commit = merge_request.diff_head_sha + their_commit = source raise 'Invalid merge target' unless our_commit raise 'Invalid merge source' unless their_commit |