summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-10-16 12:54:37 +0000
committerRémy Coutable <remy@rymai.me>2018-10-16 12:54:37 +0000
commit99127e6a15d9635f3d4946d520cc9c313ada1ce1 (patch)
tree38b2038ed12421c4f9ee894ad0c02e5464b8dd6b /Gemfile
parente11ff3b6bc3700b93f4893903ff29c8914c70464 (diff)
parent6d57cf9dd27495de966c251b3c0f736c9bb4d526 (diff)
downloadgitlab-ce-99127e6a15d9635f3d4946d520cc9c313ada1ce1.tar.gz
Merge branch 'grpc-update-1-15' into 'master'
Use grpc v1.15.x See merge request gitlab-org/gitlab-ce!22350
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 6772abeb49d..4b92bdb87fe 100644
--- a/Gemfile
+++ b/Gemfile
@@ -419,7 +419,7 @@ end
# Gitaly GRPC client
gem 'gitaly-proto', '~> 0.118.1', require: 'gitaly'
-gem 'grpc', '~> 1.11.0'
+gem 'grpc', '~> 1.15.0'
# Locked until https://github.com/google/protobuf/issues/4210 is closed
gem 'google-protobuf', '= 3.5.1'