summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2017-11-21 00:11:06 +0000
committerRobert Speicher <robert@gitlab.com>2017-11-21 00:11:06 +0000
commit9a8f094e34e9f6da5932f239a510abcd996a79b3 (patch)
tree4536f4a5faf79f29cd2f4e559dce0b5fb023f00a /Gemfile.lock
parent2b594daf9aa10f9a6469addb52f0df283f5347fb (diff)
parent473ae04d21a938a2031691b0da691ec23e6aa32c (diff)
downloadgitlab-ce-9a8f094e34e9f6da5932f239a510abcd996a79b3.tar.gz
Merge branch 'grpc-update' into 'master'
Update gRPC to v1.7.2 Closes gitaly#742 See merge request gitlab-org/gitlab-ce!15439
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock4
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 0669957e80f..8f6ffa58e5d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -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)