Merge branch 'revert-affc9e4e' into 'master'

Revert "Merge branch 'update-grpc-protobuf' into 'master'"

See merge request gitlab-org/gitlab!29102

Gemfile

@@ -457,9 +457,9 @@ end
 # Gitaly GRPC protocol definitions
 gem 'gitaly', '~> 12.9.0.pre.rc4'
 
-gem 'grpc', '~> 1.27.0'
+gem 'grpc', '~> 1.24.0'
 
-gem 'google-protobuf', '~> 3.11.2'
+gem 'google-protobuf', '~> 3.8.0'
 
 gem 'toml-rb', '~> 1.0.0'
 

Gemfile.lock

@@ -427,7 +427,7 @@ GEM
       mime-types (~> 3.0)
       representable (~> 3.0)
       retriable (>= 2.0, < 4.0)
-    google-protobuf (3.11.4)
+    google-protobuf (3.8.0)
     googleapis-common-protos-types (1.0.4)
       google-protobuf (~> 3.0)
     googleauth (0.6.6)
@@ -468,8 +468,8 @@ GEM
       graphql (~> 1.6)
       html-pipeline (~> 2.8)
       sass (~> 3.4)
-    grpc (1.27.0)
-      google-protobuf (~> 3.11)
+    grpc (1.24.0)
+      google-protobuf (~> 3.8)
       googleapis-common-protos-types (~> 1.0)
     gssapi (1.2.0)
       ffi (>= 1.0.1)
@@ -1251,7 +1251,7 @@ DEPENDENCIES
   gitlab_omniauth-ldap (~> 2.1.1)
   gon (~> 6.2)
   google-api-client (~> 0.23)
-  google-protobuf (~> 3.11.2)
+  google-protobuf (~> 3.8.0)
   gpgme (~> 2.0.19)
   grape (~> 1.1.0)
   grape-entity (~> 0.7.1)
@@ -1260,7 +1260,7 @@ DEPENDENCIES
   graphiql-rails (~> 1.4.10)
   graphql (~> 1.10.5)
   graphql-docs (~> 1.6.0)
-  grpc (~> 1.27.0)
+  grpc (~> 1.24.0)
   gssapi
   guard-rspec
   haml_lint (~> 0.34.0)

lib/api/helpers/internal_helpers.rb

@@ -110,7 +110,7 @@ module API
         return unless %w[git-receive-pack git-upload-pack git-upload-archive].include?(action)
 
         {
-          repository: repository.gitaly_repository.to_h,
+          repository: repository.gitaly_repository,
           address: Gitlab::GitalyClient.address(container.repository_storage),
           token: Gitlab::GitalyClient.token(container.repository_storage),
           features: Feature::Gitaly.server_feature_flags