diff options
| author | Jacob Vosmaer <jacob@gitlab.com> | 2017-09-08 14:00:53 +0200 |
|---|---|---|
| committer | Jacob Vosmaer <jacob@gitlab.com> | 2017-09-15 16:39:20 +0200 |
| commit | 902b5347dcbb8d93d5b055d89d8d0414fdeade74 (patch) | |
| tree | 5e7f71da382b231d5322539941ea4476ca44c6e2 /spec/models/commit_spec.rb | |
| parent | 2203e8fc35b12c19a9a0be1c2c63256047a3c5ff (diff) | |
| download | gitlab-ce-902b5347dcbb8d93d5b055d89d8d0414fdeade74.tar.gz | |
Prepare Repository#merge for migration to Gitalyoperation-service-merge
Diffstat (limited to 'spec/models/commit_spec.rb')
| -rw-r--r-- | spec/models/commit_spec.rb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/spec/models/commit_spec.rb b/spec/models/commit_spec.rb index 11e64a0f877..e3cfa149e3a 100644 --- a/spec/models/commit_spec.rb +++ b/spec/models/commit_spec.rb @@ -207,11 +207,6 @@ eos context 'of a merge commit' do let(:repository) { project.repository } - let(:commit_options) do - author = repository.user_to_committer(user) - { message: 'Test message', committer: author, author: author } - end - let(:merge_request) do create(:merge_request, source_branch: 'video', @@ -224,7 +219,7 @@ eos merge_commit_id = repository.merge(user, merge_request.diff_head_sha, merge_request, - commit_options) + 'Test message') repository.commit(merge_commit_id) end |