diff options
| author | James Lopez <james@gitlab.com> | 2017-02-27 07:57:24 +0000 |
|---|---|---|
| committer | James Lopez <james@gitlab.com> | 2017-02-27 07:57:24 +0000 |
| commit | f90054f023fb193dc08cc7a24f7ab1497c10d347 (patch) | |
| tree | b4eb8f5eae943d26736e1be949cd20221a8cfee6 | |
| parent | f23777eddbdb1e951c210206938d8fa142228763 (diff) | |
| parent | ceb3eefffb1f4f2f2e0bcb23eb6ad6fc972ba5d8 (diff) | |
| download | gitlab-ce-f90054f023fb193dc08cc7a24f7ab1497c10d347.tar.gz | |
Merge branch 'fix-compare-service-signature' into '8-16-stable'
Fix CompareService signature
See merge request !9515
| -rw-r--r-- | spec/models/merge_request_spec.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb index d90577e1a84..57026db2881 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -232,10 +232,9 @@ describe MergeRequest, models: true do context 'when there are no MR diffs' do before do - merge_request.compare = CompareService.new( + merge_request.compare = CompareService.new.execute( merge_request.source_project, - merge_request.source_branch - ).execute( + merge_request.source_branch, merge_request.target_project, merge_request.target_branch ) |