summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlejandro Rodríguez <alejorro70@gmail.com>2017-11-16 19:45:21 -0300
committerAlejandro Rodríguez <alejorro70@gmail.com>2017-11-16 19:45:21 -0300
commit54c1076f1a13d932ae9a11adfc76d3648567fe3b (patch)
tree7a722bf016a760c62a729a0ae07c66df4f986e7e
parentd41e66cb632cf4a51428c87a07cbdd182e3e0697 (diff)
downloadgitlab-ce-grpc-update.tar.gz
Update gRPC to v1.7.2grpc-update
This solves a problem where Gitaly connections through Unix sockets would not work when a proxy was configures, even if a no_proxy setting was specified
-rw-r--r--Gemfile.lock18
1 files changed, 9 insertions, 9 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index dc56e6e8f82..c2fee64c962 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -326,12 +326,12 @@ GEM
mime-types (~> 3.0)
representable (~> 3.0)
retriable (>= 2.0, < 4.0)
- google-protobuf (3.4.1.1)
- googleapis-common-protos-types (1.0.0)
+ google-protobuf (3.5.0)
+ 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)
@@ -355,10 +355,10 @@ GEM
rake
grape_logging (1.7.0)
grape
- grpc (1.6.6)
+ grpc (1.7.2)
google-protobuf (~> 3.1)
googleapis-common-protos-types (~> 1.0.0)
- googleauth (~> 0.5.1)
+ googleauth (>= 0.5.1, < 0.7)
haml (4.0.7)
tilt
haml_lint (0.26.0)
@@ -635,7 +635,7 @@ GEM
pry (~> 0.10)
pry-rails (0.3.5)
pry (>= 0.9.10)
- public_suffix (3.0.0)
+ public_suffix (3.0.1)
pyu-ruby-sasl (0.0.3.3)
rack (1.6.8)
rack-accept (0.4.5)
@@ -840,10 +840,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)