diff options
author | Robert Speicher <rspeicher@gmail.com> | 2016-07-13 21:57:30 +0300 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2016-07-13 21:57:30 +0300 |
commit | 530f5158e297f3cde27f3566cfe13bad74ba3b50 (patch) | |
tree | 270507d396bacdae8a4aa3489edfff0f47b718ca /spec/services/merge_requests/refresh_service_spec.rb | |
parent | 9b0ef1559f78e58b398e428763ff97dfdc53e186 (diff) |
Revert "Merge branch '18193-developers-can-merge' into 'master'
"
This reverts commit 9ca633eb4c62231e4ddff5466c723cf8e2bdb25d, reversing
changes made to fb229bbf7970ba908962b837b270adf56f14098f.
Diffstat (limited to 'spec/services/merge_requests/refresh_service_spec.rb')
-rw-r--r-- | spec/services/merge_requests/refresh_service_spec.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/services/merge_requests/refresh_service_spec.rb b/spec/services/merge_requests/refresh_service_spec.rb index ce643b3f860..06f56d85aa8 100644 --- a/spec/services/merge_requests/refresh_service_spec.rb +++ b/spec/services/merge_requests/refresh_service_spec.rb @@ -88,7 +88,8 @@ describe MergeRequests::RefreshService, services: true 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, commit_options) + master_commit = @project.repository.commit('master') + @project.repository.merge(@user, master_commit.id, 'feature', commit_options) commit = @project.repository.commit('feature') service.new(@project, @user).execute(@oldrev, commit.id, 'refs/heads/feature') reload_mrs |