Commit 7a9dbd4f authored by Nick Thomas's avatar Nick Thomas

Merge branch 'sh-upgrade-grpc-and-protobuf-ee' into 'master'

Bump gRPC to 1.19.0 and protobuf to 3.7.1

See merge request gitlab-org/gitlab-ee!10976
parents 9ad5f067 53b447b8
...@@ -436,9 +436,9 @@ end ...@@ -436,9 +436,9 @@ end
# Gitaly GRPC client # Gitaly GRPC client
gem 'gitaly-proto', '~> 1.19.0', require: 'gitaly' gem 'gitaly-proto', '~> 1.19.0', require: 'gitaly'
gem 'grpc', '~> 1.15.0' gem 'grpc', '~> 1.19.0'
gem 'google-protobuf', '~> 3.6' gem 'google-protobuf', '~> 3.7.1'
gem 'toml-rb', '~> 1.0.0', require: false gem 'toml-rb', '~> 1.0.0', require: false
......
...@@ -342,8 +342,8 @@ GEM ...@@ -342,8 +342,8 @@ GEM
mime-types (~> 3.0) mime-types (~> 3.0)
representable (~> 3.0) representable (~> 3.0)
retriable (>= 2.0, < 4.0) retriable (>= 2.0, < 4.0)
google-protobuf (3.6.1) google-protobuf (3.7.1)
googleapis-common-protos-types (1.0.3) googleapis-common-protos-types (1.0.4)
google-protobuf (~> 3.0) google-protobuf (~> 3.0)
googleauth (0.6.6) googleauth (0.6.6)
faraday (~> 0.12) faraday (~> 0.12)
...@@ -374,7 +374,7 @@ GEM ...@@ -374,7 +374,7 @@ GEM
railties railties
sprockets-rails sprockets-rails
graphql (1.8.1) graphql (1.8.1)
grpc (1.15.0) grpc (1.19.0)
google-protobuf (~> 3.1) google-protobuf (~> 3.1)
googleapis-common-protos-types (~> 1.0.0) googleapis-common-protos-types (~> 1.0.0)
gssapi (1.2.0) gssapi (1.2.0)
...@@ -1101,7 +1101,7 @@ DEPENDENCIES ...@@ -1101,7 +1101,7 @@ DEPENDENCIES
gitlab_omniauth-ldap (~> 2.1.1) gitlab_omniauth-ldap (~> 2.1.1)
gon (~> 6.2) gon (~> 6.2)
google-api-client (~> 0.23) google-api-client (~> 0.23)
google-protobuf (~> 3.6) google-protobuf (~> 3.7.1)
gpgme (~> 2.0.18) gpgme (~> 2.0.18)
grape (~> 1.1.0) grape (~> 1.1.0)
grape-entity (~> 0.7.1) grape-entity (~> 0.7.1)
...@@ -1109,7 +1109,7 @@ DEPENDENCIES ...@@ -1109,7 +1109,7 @@ DEPENDENCIES
grape_logging (~> 1.7) grape_logging (~> 1.7)
graphiql-rails (~> 1.4.10) graphiql-rails (~> 1.4.10)
graphql (~> 1.8.0) graphql (~> 1.8.0)
grpc (~> 1.15.0) grpc (~> 1.19.0)
gssapi gssapi
haml_lint (~> 0.28.0) haml_lint (~> 0.28.0)
hamlit (~> 2.8.8) hamlit (~> 2.8.8)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment