diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-04-30 15:12:55 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-04-30 15:12:55 +0000 |
| commit | 16e848c17adcf69476e443e6d0849556b0fe6442 (patch) | |
| tree | 0c3c87c2f69d00295500fdd5dcff115977dc6611 | |
| parent | d9ccc3af6f8d7f7890effc6c279ac6a0c0597a26 (diff) | |
| parent | 1bfaf10295c5b3c7ab477a5622ce985fa849c046 (diff) | |
| download | gitlab-ce-16e848c17adcf69476e443e6d0849556b0fe6442.tar.gz | |
Merge branch 'grpc-1.11.0' into 'master'
Use grpc 1.11.0
See merge request gitlab-org/gitlab-ce!18652
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -414,7 +414,7 @@ end # Gitaly GRPC client gem 'gitaly-proto', '~> 0.97.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 29c37bc7f1f..9b2c47587ee 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) @@ -1073,7 +1073,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 |