Merge branch 'jc-refactor-conflict-files-sticker' into 'master'

Use original repository for list conflict call

Closes gitaly#2093

See merge request gitlab-org/gitlab!18692

lib/gitlab/gitaly_client/conflict_files_stitcher.rb

@@ -5,8 +5,11 @@ module Gitlab
     class ConflictFilesStitcher
       include Enumerable
 
-      def initialize(rpc_response)
+      attr_reader :gitaly_repo
+
+      def initialize(rpc_response, gitaly_repo)
         @rpc_response = rpc_response
+        @gitaly_repo = gitaly_repo
       end
 
       def each
@@ -31,7 +34,7 @@ module Gitlab
 
       def file_from_gitaly_header(header)
         Gitlab::Git::Conflict::File.new(
-          Gitlab::GitalyClient::Util.git_repository(header.repository),
+          Gitlab::GitalyClient::Util.git_repository(gitaly_repo),
           header.commit_oid,
           conflict_from_gitaly_file_header(header),
           ''

lib/gitlab/gitaly_client/conflicts_service.rb

@@ -22,7 +22,7 @@ module Gitlab
         )
         response = GitalyClient.call(@repository.storage, :conflicts_service, :list_conflict_files, request, timeout: GitalyClient.long_timeout)
 
-        GitalyClient::ConflictFilesStitcher.new(response)
+        GitalyClient::ConflictFilesStitcher.new(response, @gitaly_repo)
       end
 
       def conflicts?

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)