diff options
| author | Zeger-Jan van de Weg <mail@zjvandeweg.nl> | 2015-12-03 12:27:34 +0300 |
|---|---|---|
| committer | Zeger-Jan van de Weg <mail@zjvandeweg.nl> | 2015-12-05 17:42:38 +0300 |
| commit | 2462a96e459c95f987f39e3c380de7c7cc350cfd (patch) | |
| tree | 065157ddb9e707a911bc38c878662bfaf0cca3c2 /spec/services/merge_requests/refresh_service_spec.rb | |
| parent | 25907ebe476a24bfdd2c451f18227d4fcf314b07 (diff) | |
Incorporate feedback
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 18b2659c1f6..9a8174f95fd 100644 --- a/spec/services/merge_requests/refresh_service_spec.rb +++ b/spec/services/merge_requests/refresh_service_spec.rb @@ -18,7 +18,8 @@ describe MergeRequests::RefreshService do source_branch: 'master', target_branch: 'feature', target_project: @project, - merge_when_build_succeeds: true) + merge_when_build_succeeds: true, + merge_user: @user) @fork_merge_request = create(:merge_request, source_project: @fork_project, |