diff options
| author | Sean McGivern <sean@gitlab.com> | 2017-02-01 17:28:04 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2017-02-03 12:46:03 +0300 |
| commit | 7550f60ddeecebac3f84e8690ab3f42428600ff7 (patch) | |
| tree | f2121574ae7e46a2cc970f92a1287ad1289c4e5b /spec/lib/gitlab/diff | |
| parent | fd46fb1cd9cc1fdf826d31261aa594baa38d4898 (diff) | |
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/lib/gitlab/diff')
| -rw-r--r-- | spec/lib/gitlab/diff/position_tracer_spec.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/spec/lib/gitlab/diff/position_tracer_spec.rb b/spec/lib/gitlab/diff/position_tracer_spec.rb index ffb9ba86fbb..8e3e4034c8f 100644 --- a/spec/lib/gitlab/diff/position_tracer_spec.rb +++ b/spec/lib/gitlab/diff/position_tracer_spec.rb @@ -1640,7 +1640,9 @@ describe Gitlab::Diff::PositionTracer, lib: true do } merge_request = create(:merge_request, source_branch: second_create_file_commit.sha, target_branch: branch_name, source_project: project) - repository.merge(current_user, merge_request, options) + + repository.merge(current_user, merge_request.diff_head_sha, merge_request, options) + project.commit(branch_name) end |