Commit b458b415 authored by Nick Thomas's avatar Nick Thomas

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

Bump gRPC to 1.19.0 and protobuf to 3.7.1

See merge request gitlab-org/gitlab-ce!27086
parents 4f2005df 2066cb6c
......@@ -418,9 +418,9 @@ end
# Gitaly GRPC client
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
......
......@@ -316,8 +316,8 @@ GEM
mime-types (~> 3.0)
representable (~> 3.0)
retriable (>= 2.0, < 4.0)
google-protobuf (3.6.1)
googleapis-common-protos-types (1.0.3)
google-protobuf (3.7.1)
googleapis-common-protos-types (1.0.4)
google-protobuf (~> 3.0)
googleauth (0.6.6)
faraday (~> 0.12)
......@@ -348,7 +348,7 @@ GEM
railties
sprockets-rails
graphql (1.8.1)
grpc (1.15.0)
grpc (1.19.0)
google-protobuf (~> 3.1)
googleapis-common-protos-types (~> 1.0.0)
haml (5.0.4)
......@@ -1062,7 +1062,7 @@ DEPENDENCIES
gitlab_omniauth-ldap (~> 2.1.1)
gon (~> 6.2)
google-api-client (~> 0.23)
google-protobuf (~> 3.6)
google-protobuf (~> 3.7.1)
gpgme (~> 2.0.18)
grape (~> 1.1.0)
grape-entity (~> 0.7.1)
......@@ -1070,7 +1070,7 @@ DEPENDENCIES
grape_logging (~> 1.7)
graphiql-rails (~> 1.4.10)
graphql (~> 1.8.0)
grpc (~> 1.15.0)
grpc (~> 1.19.0)
haml_lint (~> 0.28.0)
hamlit (~> 2.8.8)
hangouts-chat (~> 0.0.5)
......
---
title: Bump gRPC to 1.19.0 and protobuf to 3.7.1
merge_request: 27086
author:
type: other
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