Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42

1 files changed, 10 insertions, 1 deletions

diff --git a/lib/gitlab/gitaly_client/repository_service.rb b/lib/gitlab/gitaly_client/repository_service.rb
index d2dbd456180..6a75096ff80 100644
--- a/lib/gitlab/gitaly_client/repository_service.rb
+++ b/lib/gitlab/gitaly_client/repository_service.rb
@@ -70,13 +70,21 @@ module Gitlab
         end.join
       end
 
-      def fetch_remote(remote, ssh_auth:, forced:, no_tags:, timeout:, prune: true, check_tags_changed: false)
+      # rubocop: disable Metrics/ParameterLists
+      # The `remote` parameter is going away soonish anyway, at which point the
+      # Rubocop warning can be enabled again.
+      def fetch_remote(remote, url:, refmap:, ssh_auth:, forced:, no_tags:, timeout:, prune: true, check_tags_changed: false)
         request = Gitaly::FetchRemoteRequest.new(
           repository: @gitaly_repo, remote: remote, force: forced,
           no_tags: no_tags, timeout: timeout, no_prune: !prune,
           check_tags_changed: check_tags_changed
         )
 
+        if url
+          request.remote_params = Gitaly::Remote.new(url: url,
+                                                     mirror_refmaps: Array.wrap(refmap).map(&:to_s))
+        end
+
         if ssh_auth&.ssh_mirror_url?
           if ssh_auth.ssh_key_auth? && ssh_auth.ssh_private_key.present?
             request.ssh_key = ssh_auth.ssh_private_key
@@ -89,6 +97,7 @@ module Gitlab
 
         GitalyClient.call(@storage, :repository_service, :fetch_remote, request, timeout: GitalyClient.long_timeout)
       end
+      # rubocop: enable Metrics/ParameterLists
 
       def create_repository
         request = Gitaly::CreateRepositoryRequest.new(repository: @gitaly_repo)