diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-18 00:07:45 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-18 00:07:45 +0000 |
| commit | 7c077d960393e14b56d43cceaa7f609c703ac55f (patch) | |
| tree | c3a5d79554b9be1d7434c8e9a8fcae35ab64af32 /spec/lib/gitlab/gitaly_client | |
| parent | da35510cdad8f8d3cb6c119682dc2735531983cd (diff) | |
| download | gitlab-ce-7c077d960393e14b56d43cceaa7f609c703ac55f.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib/gitlab/gitaly_client')
| -rw-r--r-- | spec/lib/gitlab/gitaly_client/conflict_files_stitcher_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/lib/gitlab/gitaly_client/conflict_files_stitcher_spec.rb b/spec/lib/gitlab/gitaly_client/conflict_files_stitcher_spec.rb index 1c933410bd5..a3602463756 100644 --- a/spec/lib/gitlab/gitaly_client/conflict_files_stitcher_spec.rb +++ b/spec/lib/gitlab/gitaly_client/conflict_files_stitcher_spec.rb @@ -32,7 +32,7 @@ describe Gitlab::GitalyClient::ConflictFilesStitcher do double(files: [double(header: nil, content: content_2[11..-1])]) ] - conflict_files = described_class.new(messages).to_a + conflict_files = described_class.new(messages, target_repository.gitaly_repository).to_a expect(conflict_files.size).to be(2) |