Merge branch 'zj-protobuf' into 'master'

Downgrade google-protobuf

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

GITALY_SERVER_VERSION

-0.78.0
+0.80.0

Gemfile

@@ -411,6 +411,8 @@ end
 
 # Gitaly GRPC client
 gem 'gitaly-proto', '~> 0.83.0', require: 'gitaly'
+# Locked until https://github.com/google/protobuf/issues/4210 is closed
+gem 'google-protobuf', '= 3.5.1'
 
 gem 'toml-rb', '~> 0.3.15', require: false
 

Gemfile.lock

@@ -340,7 +340,7 @@ GEM
       mime-types (~> 3.0)
       representable (~> 3.0)
       retriable (>= 2.0, < 4.0)
-    google-protobuf (3.5.1.1)
+    google-protobuf (3.5.1)
     googleapis-common-protos-types (1.0.1)
       google-protobuf (~> 3.0)
     googleauth (0.5.3)
@@ -1066,6 +1066,7 @@ DEPENDENCIES
   gollum-rugged_adapter (~> 0.4.4)
   gon (~> 6.1.0)
   google-api-client (~> 0.13.6)
+  google-protobuf (= 3.5.1)
   gpgme
   grape (~> 1.0)
   grape-entity (~> 0.6.0)

changelogs/unreleased/zj-protobuf.yml

+---
+title: Downgrade google-protobuf gem
+merge_request: 16941
+author:
+type: other