Merge branch 'fix/upgrade-grpc-to-1-1-0' into 'master'
Upgrade grpc gem to 1.10.0 See merge request gitlab-org/gitlab-ce!17575
This commit is contained in:
commit
2f6deb128a
4
Gemfile
4
Gemfile
|
@ -413,9 +413,7 @@ end
|
||||||
|
|
||||||
# Gitaly GRPC client
|
# Gitaly GRPC client
|
||||||
gem 'gitaly-proto', '~> 0.88.0', require: 'gitaly'
|
gem 'gitaly-proto', '~> 0.88.0', require: 'gitaly'
|
||||||
# Explicitly lock grpc as we know 1.9 is bad
|
gem 'grpc', '~> 1.10.0'
|
||||||
# 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
|
# Locked until https://github.com/google/protobuf/issues/4210 is closed
|
||||||
gem 'google-protobuf', '= 3.5.1'
|
gem 'google-protobuf', '= 3.5.1'
|
||||||
|
|
16
Gemfile.lock
16
Gemfile.lock
|
@ -345,9 +345,9 @@ GEM
|
||||||
google-protobuf (3.5.1)
|
google-protobuf (3.5.1)
|
||||||
googleapis-common-protos-types (1.0.1)
|
googleapis-common-protos-types (1.0.1)
|
||||||
google-protobuf (~> 3.0)
|
google-protobuf (~> 3.0)
|
||||||
googleauth (0.5.3)
|
googleauth (0.6.2)
|
||||||
faraday (~> 0.12)
|
faraday (~> 0.12)
|
||||||
jwt (~> 1.4)
|
jwt (>= 1.4, < 3.0)
|
||||||
logging (~> 2.0)
|
logging (~> 2.0)
|
||||||
memoist (~> 0.12)
|
memoist (~> 0.12)
|
||||||
multi_json (~> 1.11)
|
multi_json (~> 1.11)
|
||||||
|
@ -371,7 +371,7 @@ GEM
|
||||||
rake
|
rake
|
||||||
grape_logging (1.7.0)
|
grape_logging (1.7.0)
|
||||||
grape
|
grape
|
||||||
grpc (1.8.3)
|
grpc (1.10.0)
|
||||||
google-protobuf (~> 3.1)
|
google-protobuf (~> 3.1)
|
||||||
googleapis-common-protos-types (~> 1.0.0)
|
googleapis-common-protos-types (~> 1.0.0)
|
||||||
googleauth (>= 0.5.1, < 0.7)
|
googleauth (>= 0.5.1, < 0.7)
|
||||||
|
@ -505,7 +505,7 @@ GEM
|
||||||
mini_portile2 (2.3.0)
|
mini_portile2 (2.3.0)
|
||||||
minitest (5.7.0)
|
minitest (5.7.0)
|
||||||
mousetrap-rails (1.4.6)
|
mousetrap-rails (1.4.6)
|
||||||
multi_json (1.12.2)
|
multi_json (1.13.1)
|
||||||
multi_xml (0.6.0)
|
multi_xml (0.6.0)
|
||||||
multipart-post (2.0.0)
|
multipart-post (2.0.0)
|
||||||
mustermann (1.0.0)
|
mustermann (1.0.0)
|
||||||
|
@ -648,7 +648,7 @@ GEM
|
||||||
pry (~> 0.10)
|
pry (~> 0.10)
|
||||||
pry-rails (0.3.5)
|
pry-rails (0.3.5)
|
||||||
pry (>= 0.9.10)
|
pry (>= 0.9.10)
|
||||||
public_suffix (3.0.0)
|
public_suffix (3.0.2)
|
||||||
pyu-ruby-sasl (0.0.3.3)
|
pyu-ruby-sasl (0.0.3.3)
|
||||||
rack (1.6.8)
|
rack (1.6.8)
|
||||||
rack-accept (0.4.5)
|
rack-accept (0.4.5)
|
||||||
|
@ -862,10 +862,10 @@ GEM
|
||||||
sidekiq (>= 4.2.1)
|
sidekiq (>= 4.2.1)
|
||||||
sidekiq-limit_fetch (3.4.0)
|
sidekiq-limit_fetch (3.4.0)
|
||||||
sidekiq (>= 4)
|
sidekiq (>= 4)
|
||||||
signet (0.7.3)
|
signet (0.8.1)
|
||||||
addressable (~> 2.3)
|
addressable (~> 2.3)
|
||||||
faraday (~> 0.9)
|
faraday (~> 0.9)
|
||||||
jwt (~> 1.5)
|
jwt (>= 1.5, < 3.0)
|
||||||
multi_json (~> 1.10)
|
multi_json (~> 1.10)
|
||||||
simple_po_parser (1.1.2)
|
simple_po_parser (1.1.2)
|
||||||
simplecov (0.14.1)
|
simplecov (0.14.1)
|
||||||
|
@ -1078,7 +1078,7 @@ DEPENDENCIES
|
||||||
grape-entity (~> 0.6.0)
|
grape-entity (~> 0.6.0)
|
||||||
grape-route-helpers (~> 2.1.0)
|
grape-route-helpers (~> 2.1.0)
|
||||||
grape_logging (~> 1.7)
|
grape_logging (~> 1.7)
|
||||||
grpc (~> 1.8.3)
|
grpc (~> 1.10.0)
|
||||||
haml_lint (~> 0.26.0)
|
haml_lint (~> 0.26.0)
|
||||||
hamlit (~> 2.6.1)
|
hamlit (~> 2.6.1)
|
||||||
hashie-forbidden_attributes
|
hashie-forbidden_attributes
|
||||||
|
|
Loading…
Reference in New Issue