Commit b1e572c0 authored by Sean McGivern's avatar Sean McGivern

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

Update gRPC to v1.24.0

Closes #34425

See merge request gitlab-org/gitlab!18837
parents 115fb465 f3e9c3f7
......@@ -448,9 +448,9 @@ end
# Gitaly GRPC protocol definitions
gem 'gitaly', '~> 1.65.0'
gem 'grpc', '~> 1.19.0'
gem 'grpc', '~> 1.24.0'
gem 'google-protobuf', '~> 3.7.1'
gem 'google-protobuf', '~> 3.8.0'
gem 'toml-rb', '~> 1.0.0', require: false
......
......@@ -400,7 +400,7 @@ GEM
mime-types (~> 3.0)
representable (~> 3.0)
retriable (>= 2.0, < 4.0)
google-protobuf (3.7.1)
google-protobuf (3.8.0)
googleapis-common-protos-types (1.0.4)
google-protobuf (~> 3.0)
googleauth (0.6.6)
......@@ -440,9 +440,9 @@ GEM
graphql (~> 1.6)
html-pipeline (~> 2.8)
sass (~> 3.4)
grpc (1.19.0)
google-protobuf (~> 3.1)
googleapis-common-protos-types (~> 1.0.0)
grpc (1.24.0)
google-protobuf (~> 3.8)
googleapis-common-protos-types (~> 1.0)
gssapi (1.2.0)
ffi (>= 1.0.1)
haml (5.0.4)
......@@ -1181,7 +1181,7 @@ DEPENDENCIES
gitlab_omniauth-ldap (~> 2.1.1)
gon (~> 6.2)
google-api-client (~> 0.23)
google-protobuf (~> 3.7.1)
google-protobuf (~> 3.8.0)
gpgme (~> 2.0.18)
grape (~> 1.1.0)
grape-entity (~> 0.7.1)
......@@ -1190,7 +1190,7 @@ DEPENDENCIES
graphiql-rails (~> 1.4.10)
graphql (~> 1.9.11)
graphql-docs (~> 1.6.0)
grpc (~> 1.19.0)
grpc (~> 1.24.0)
gssapi
haml_lint (~> 0.31.0)
hamlit (~> 2.8.8)
......
---
title: Update gRPC to v1.24.0
merge_request: 18837
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