diff options
| author | Ahmad Sherif <me@ahmadsherif.com> | 2018-03-06 18:27:09 +0100 |
|---|---|---|
| committer | Ahmad Sherif <me@ahmadsherif.com> | 2018-03-06 18:27:09 +0100 |
| commit | fdb50805f3c12829a9265575fb4f7329cd50bfa6 (patch) | |
| tree | caddf99efb4ae4a3b733c075c0b0e3dd60b6a826 | |
| parent | 5e8138aa54492dd3ace42d889ba01f82e8e19c83 (diff) | |
| download | gitlab-ce-fix/upgrade-grpc-to-1-1-0.tar.gz | |
Upgrade grpc gem to 1.10.0fix/upgrade-grpc-to-1-1-0
Related to gitaly#1060
| -rw-r--r-- | Gemfile | 4 | ||||
| -rw-r--r-- | Gemfile.lock | 16 |
2 files changed, 9 insertions, 11 deletions
@@ -412,9 +412,7 @@ 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' +gem 'grpc', '~> 1.10.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 010d4f7b56a..e95cb2bc38e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -343,9 +343,9 @@ GEM google-protobuf (3.5.1) googleapis-common-protos-types (1.0.1) google-protobuf (~> 3.0) - googleauth (0.5.3) + googleauth (0.6.2) faraday (~> 0.12) - jwt (~> 1.4) + jwt (>= 1.4, < 3.0) logging (~> 2.0) memoist (~> 0.12) multi_json (~> 1.11) @@ -369,7 +369,7 @@ GEM rake grape_logging (1.7.0) grape - grpc (1.8.3) + grpc (1.10.0) google-protobuf (~> 3.1) googleapis-common-protos-types (~> 1.0.0) googleauth (>= 0.5.1, < 0.7) @@ -503,7 +503,7 @@ GEM mini_portile2 (2.3.0) minitest (5.7.0) mousetrap-rails (1.4.6) - multi_json (1.12.2) + multi_json (1.13.1) multi_xml (0.6.0) multipart-post (2.0.0) mustermann (1.0.0) @@ -646,7 +646,7 @@ GEM pry (~> 0.10) pry-rails (0.3.5) pry (>= 0.9.10) - public_suffix (3.0.0) + public_suffix (3.0.2) pyu-ruby-sasl (0.0.3.3) rack (1.6.8) rack-accept (0.4.5) @@ -858,10 +858,10 @@ GEM sidekiq (>= 4.2.1) sidekiq-limit_fetch (3.4.0) sidekiq (>= 4) - signet (0.7.3) + signet (0.8.1) addressable (~> 2.3) faraday (~> 0.9) - jwt (~> 1.5) + jwt (>= 1.5, < 3.0) multi_json (~> 1.10) simple_po_parser (1.1.2) simplecov (0.14.1) @@ -1073,7 +1073,7 @@ DEPENDENCIES grape-entity (~> 0.6.0) grape-route-helpers (~> 2.1.0) grape_logging (~> 1.7) - grpc (~> 1.8.3) + grpc (~> 1.10.0) haml_lint (~> 0.26.0) hamlit (~> 2.6.1) hashie-forbidden_attributes |