diff options
| author | Jacob Vosmaer <jacob@gitlab.com> | 2018-05-17 17:43:39 +0200 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-05-18 09:45:36 -0700 |
| commit | 294731f7ee8b36a8a6f94e5f9c7870f38a9293b8 (patch) | |
| tree | e0c8bff2bdc2ac89c1a83add76642484c6838e64 | |
| parent | 2555d6c1a2e5470614a3ef872a13ca60ffeed081 (diff) | |
| download | gitlab-ce-10-7-grpc-1.11.tar.gz | |
Use grpc 1.11.010-7-grpc-1.11
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -421,7 +421,7 @@ end # Gitaly GRPC client gem 'gitaly-proto', '~> 0.96.0', require: 'gitaly' -gem 'grpc', '~> 1.10.0' +gem 'grpc', '~> 1.11.0' # 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 31b0dc9c0e6..3c4d30c3069 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -374,7 +374,7 @@ GEM rake grape_logging (1.7.0) grape - grpc (1.10.0) + grpc (1.11.0) google-protobuf (~> 3.1) googleapis-common-protos-types (~> 1.0.0) googleauth (>= 0.5.1, < 0.7) @@ -1074,7 +1074,7 @@ DEPENDENCIES grape-entity (~> 0.6.0) grape-route-helpers (~> 2.1.0) grape_logging (~> 1.7) - grpc (~> 1.10.0) + grpc (~> 1.11.0) haml_lint (~> 0.26.0) hamlit (~> 2.6.1) hashie-forbidden_attributes |