diff options
| author | Alejandro RodrÃguez <alejorro70@gmail.com> | 2017-10-06 22:41:23 -0300 |
|---|---|---|
| committer | Alejandro RodrÃguez <alejorro70@gmail.com> | 2017-10-12 22:03:14 -0300 |
| commit | 3fcab51ebb0f3156b5d732d050b292cd3e081262 (patch) | |
| tree | 7292079f50121aae6e457bfd3dadb944fb2feeec /spec/lib/gitlab/conflict/file_collection_spec.rb | |
| parent | 9cc15172deaa4582c5fd956cc163539041d018b1 (diff) | |
| download | gitlab-ce-3fcab51ebb0f3156b5d732d050b292cd3e081262.tar.gz | |
Refactor conflict resolution to contain git ops within Gitlab::Git
This prepares the codebase for a Gitaly migration. See
https://gitlab.com/gitlab-org/gitaly/issues/553
Diffstat (limited to 'spec/lib/gitlab/conflict/file_collection_spec.rb')
| -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 a4d7628b03a..5944ce8049a 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 do let(:merge_request) { create(:merge_request, source_branch: 'conflict-resolvable', target_branch: 'conflict-start') } - let(:file_collection) { described_class.read_only(merge_request) } + let(:file_collection) { described_class.new(merge_request) } describe '#files' do it 'returns an array of Conflict::Files' do |