diff options
| author | Jacob Vosmaer <jacob@gitlab.com> | 2017-09-08 15:00:53 +0300 |
|---|---|---|
| committer | Jacob Vosmaer <jacob@gitlab.com> | 2017-09-15 17:39:20 +0300 |
| commit | 902b5347dcbb8d93d5b055d89d8d0414fdeade74 (patch) | |
| tree | 5e7f71da382b231d5322539941ea4476ca44c6e2 /spec/services/merge_requests/refresh_service_spec.rb | |
| parent | 2203e8fc35b12c19a9a0be1c2c63256047a3c5ff (diff) | |
Prepare Repository#merge for migration to Gitaly
Diffstat (limited to 'spec/services/merge_requests/refresh_service_spec.rb')
| -rw-r--r-- | spec/services/merge_requests/refresh_service_spec.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/spec/services/merge_requests/refresh_service_spec.rb b/spec/services/merge_requests/refresh_service_spec.rb index 2af2485eeed..64e676f22a0 100644 --- a/spec/services/merge_requests/refresh_service_spec.rb +++ b/spec/services/merge_requests/refresh_service_spec.rb @@ -150,9 +150,7 @@ describe MergeRequests::RefreshService do context 'manual merge of source branch' do before do # Merge master -> feature branch - author = { email: 'test@gitlab.com', time: Time.now, name: "Me" } - commit_options = { message: 'Test message', committer: author, author: author } - @project.repository.merge(@user, @merge_request.diff_head_sha, @merge_request, commit_options) + @project.repository.merge(@user, @merge_request.diff_head_sha, @merge_request, 'Test message') commit = @project.repository.commit('feature') service.new(@project, @user).execute(@oldrev, commit.id, 'refs/heads/feature') reload_mrs |