diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-05-19 18:22:21 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-05-19 18:22:21 +0300 |
| commit | 441f37f23bc2aa2669107d6bc8bed86046e225f4 (patch) | |
| tree | afa0e1a8831e41d2d8c1adccdd0a18caed78b5fe /spec/lib | |
| parent | b54faeb9527d61a89c999dc77c2af119942110ec (diff) | |
| parent | c215461cfc2923c9db2bf9794e7954fcf343e6c9 (diff) | |
Merge branch '9-2-stable-fix-conflicts-for-mr-11298' into '9-2-stable'
Fix 9.2 conflicts for "Fix conflict resolution from corrupted upstream"
See merge request !11533
Diffstat (limited to 'spec/lib')
| -rw-r--r-- | spec/lib/gitlab/conflict/file_collection_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/lib/gitlab/conflict/file_collection_spec.rb b/spec/lib/gitlab/conflict/file_collection_spec.rb index 39d892c18c0..27f23ea70dc 100644 --- a/spec/lib/gitlab/conflict/file_collection_spec.rb +++ b/spec/lib/gitlab/conflict/file_collection_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' describe Gitlab::Conflict::FileCollection, lib: true do let(:merge_request) { create(:merge_request, source_branch: 'conflict-resolvable', target_branch: 'conflict-start') } - let(:file_collection) { Gitlab::Conflict::FileCollection.new(merge_request) } + let(:file_collection) { described_class.read_only(merge_request) } describe '#files' do it 'returns an array of Conflict::Files' do |