Merge branch 'fix/use-mirror-refmaps-instead-mirror-refmap' into 'master'

Add support for multiple refmaps to RemoteService#add_remote

Closes gitaly#903

See merge request gitlab-org/gitlab-ce!16331

GITALY_SERVER_VERSION

-0.66.0
+0.67.0

Gemfile

@@ -406,7 +406,7 @@ group :ed25519 do
 end
 
 # Gitaly GRPC client
-gem 'gitaly-proto', '~> 0.64.0', require: 'gitaly'
+gem 'gitaly-proto', '~> 0.69.0', require: 'gitaly'
 
 gem 'toml-rb', '~> 0.3.15', require: false
 

Gemfile.lock

@@ -284,7 +284,7 @@ GEM
       po_to_json (>= 1.0.0)
       rails (>= 3.2.0)
     gherkin-ruby (0.3.2)
-    gitaly-proto (0.64.0)
+    gitaly-proto (0.69.0)
       google-protobuf (~> 3.1)
       grpc (~> 1.0)
     github-linguist (4.7.6)
@@ -1053,7 +1053,7 @@ DEPENDENCIES
   gettext (~> 3.2.2)
   gettext_i18n_rails (~> 1.8.0)
   gettext_i18n_rails_js (~> 1.2.0)
-  gitaly-proto (~> 0.64.0)
+  gitaly-proto (~> 0.69.0)
   github-linguist (~> 4.7.0)
   gitlab-flowdock-git-hook (~> 1.0.1)
   gitlab-markup (~> 1.6.2)

lib/gitlab/gitaly_client/remote_service.rb

@@ -7,10 +7,12 @@ module Gitlab
         @storage = repository.storage
       end
 
-      def add_remote(name, url, mirror_refmap)
+      def add_remote(name, url, mirror_refmaps)
         request = Gitaly::AddRemoteRequest.new(
-          repository: @gitaly_repo, name: name, url: url,
-          mirror_refmap: mirror_refmap.to_s
+          repository: @gitaly_repo,
+          name: name,
+          url: url,
+          mirror_refmaps: Array.wrap(mirror_refmaps).map(&:to_s)
         )
 
         GitalyClient.call(@storage, :remote_service, :add_remote, request)