Bump gRPC to 1.19.0 and protobuf to 3.7.1
These upgrades are necessary to support Ruby 2.6. This matches the Gitaly MR: https://gitlab.com/gitlab-org/gitaly/merge_requests/1066
This commit is contained in:
parent
dfb2c3784e
commit
2066cb6cf4
4
Gemfile
4
Gemfile
|
@ -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
|
||||
|
||||
|
|
10
Gemfile.lock
10
Gemfile.lock
|
@ -317,8 +317,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)
|
||||
|
@ -349,7 +349,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)
|
||||
|
@ -1063,7 +1063,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)
|
||||
|
@ -1071,7 +1071,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)
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Bump gRPC to 1.19.0 and protobuf to 3.7.1
|
||||
merge_request: 27086
|
||||
author:
|
||||
type: other
|
Loading…
Reference in New Issue