summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2019-04-07 04:41:22 -0700
committerStan Hu <stanhu@gmail.com>2019-04-22 22:56:23 -0700
commit2066cb6cf40747068afcfa159a04a277f38ab804 (patch)
treeca39a3e4c3db27a0f802e0bd68521f4e6acfbcd2
parentdfb2c3784e06684e3d76b0f9b30906ef086b938a (diff)
downloadgitlab-ce-2066cb6cf40747068afcfa159a04a277f38ab804.tar.gz
Bump gRPC to 1.19.0 and protobuf to 3.7.1sh-upgrade-grpc-and-protobuf
These upgrades are necessary to support Ruby 2.6. This matches the Gitaly MR: https://gitlab.com/gitlab-org/gitaly/merge_requests/1066
-rw-r--r--Gemfile4
-rw-r--r--Gemfile.lock10
-rw-r--r--changelogs/unreleased/sh-upgrade-grpc-and-protobuf.yml5
3 files changed, 12 insertions, 7 deletions
diff --git a/Gemfile b/Gemfile
index e0f892e8929..fcb3590a61e 100644
--- a/Gemfile
+++ b/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
diff --git a/Gemfile.lock b/Gemfile.lock
index d214892eed7..b59c5faa43b 100644
--- a/Gemfile.lock
+++ b/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)
diff --git a/changelogs/unreleased/sh-upgrade-grpc-and-protobuf.yml b/changelogs/unreleased/sh-upgrade-grpc-and-protobuf.yml
new file mode 100644
index 00000000000..a43a59a4f8a
--- /dev/null
+++ b/changelogs/unreleased/sh-upgrade-grpc-and-protobuf.yml
@@ -0,0 +1,5 @@
+---
+title: Bump gRPC to 1.19.0 and protobuf to 3.7.1
+merge_request: 27086
+author:
+type: other