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 /spec/models/repository_spec.rb | |
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 'spec/models/repository_spec.rb')
-rw-r--r-- | spec/models/repository_spec.rb | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb index 901cfb907f2..53b98ba05f8 100644 --- a/spec/models/repository_spec.rb +++ b/spec/models/repository_spec.rb @@ -15,7 +15,12 @@ describe Repository, models: true do let(:merge_commit) do merge_request = create(:merge_request, source_branch: 'feature', target_branch: 'master', source_project: project) - merge_commit_id = repository.merge(user, merge_request, commit_options) + + merge_commit_id = repository.merge(user, + merge_request.diff_head_sha, + merge_request, + commit_options) + repository.commit(merge_commit_id) end @@ -1082,8 +1087,11 @@ describe Repository, models: true do it 'sets the `in_progress_merge_commit_sha` flag for the given merge request' do merge_request = create(:merge_request, source_branch: 'feature', target_branch: 'master', source_project: project) - merge_commit_id = repository.merge(user, merge_request, commit_options) - repository.commit(merge_commit_id) + + merge_commit_id = repository.merge(user, + merge_request.diff_head_sha, + merge_request, + commit_options) expect(merge_request.in_progress_merge_commit_sha).to eq(merge_commit_id) end |