diff options
| -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 |