diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-09-18 09:06:23 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-09-18 09:06:23 +0000 |
| commit | 2f594206e2f86e332b5d6ff0426ad966efef33b3 (patch) | |
| tree | 533f4396f31dd3d65820ca990bfde5f21d22c476 /spec/lib | |
| parent | d86bbe012644c672874ccd99d68847b751c4b635 (diff) | |
| parent | 902b5347dcbb8d93d5b055d89d8d0414fdeade74 (diff) | |
| download | gitlab-ce-2f594206e2f86e332b5d6ff0426ad966efef33b3.tar.gz | |
Merge branch 'operation-service-merge' into 'master'
Prepare Repository#merge for migration to Gitaly
Closes gitaly#559
See merge request gitlab-org/gitlab-ce!14154
Diffstat (limited to 'spec/lib')
| -rw-r--r-- | spec/lib/gitlab/diff/position_tracer_spec.rb | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/spec/lib/gitlab/diff/position_tracer_spec.rb b/spec/lib/gitlab/diff/position_tracer_spec.rb index 8beebc10040..4fa30d8df8b 100644 --- a/spec/lib/gitlab/diff/position_tracer_spec.rb +++ b/spec/lib/gitlab/diff/position_tracer_spec.rb @@ -1761,17 +1761,9 @@ describe Gitlab::Diff::PositionTracer do let(:merge_commit) do update_file_again_commit - committer = repository.user_to_committer(current_user) - - options = { - message: "Merge branches", - author: committer, - committer: committer - } - 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.diff_head_sha, merge_request, options) + repository.merge(current_user, merge_request.diff_head_sha, merge_request, "Merge branches") project.commit(branch_name) end |