diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-03-06 12:18:19 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-03-06 12:18:19 +0000 |
| commit | fa31559a37bfe394dedf4078789f1540e01fc5c7 (patch) | |
| tree | 760e9153f1deb292fa033304901af3ba6ee48c3d | |
| parent | 2a7b3d074338541d9152610fcce0d768ce4c8170 (diff) | |
| parent | cf34f33ac906eb9011a6f1dc0979c9bfc4e09e59 (diff) | |
| download | gitlab-ce-fa31559a37bfe394dedf4078789f1540e01fc5c7.tar.gz | |
Merge branch 'zj-lock-grpc-gem' into 'master'
Lock gRPC gem to 1.8
Closes gitaly#1059
See merge request gitlab-org/gitlab-ce!17484
| -rw-r--r-- | Gemfile | 4 | ||||
| -rw-r--r-- | Gemfile.lock | 1 |
2 files changed, 5 insertions, 0 deletions
@@ -412,6 +412,10 @@ end # Gitaly GRPC client gem 'gitaly-proto', '~> 0.88.0', require: 'gitaly' +# Explicitly lock grpc as we know 1.9 is bad +# 1.10 is still being tested. See gitlab-org/gitaly#1059 +gem 'grpc', '~> 1.8.3' + # Locked until https://github.com/google/protobuf/issues/4210 is closed gem 'google-protobuf', '= 3.5.1' diff --git a/Gemfile.lock b/Gemfile.lock index a5c94a9e074..010d4f7b56a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1073,6 +1073,7 @@ DEPENDENCIES grape-entity (~> 0.6.0) grape-route-helpers (~> 2.1.0) grape_logging (~> 1.7) + grpc (~> 1.8.3) haml_lint (~> 0.26.0) hamlit (~> 2.6.1) hashie-forbidden_attributes |