Merge branch 'ee-grpc-update' into 'master'

[EE] Update gRPC to v1.7.2 See merge request gitlab-org/gitlab-ee!3443

Merge branch 'ee-grpc-update' into 'master'
[EE] Update gRPC to v1.7.2 See merge request gitlab-org/gitlab-ee!3443
93b7a1d3 · Robert Speicher · 031a436e · c61e936b · 93b7a1d3
Commit 93b7a1d3 authored Nov 21, 2017 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Gemfile.lock Gemfile.lock +2 -2

No files found.
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -379,10 +379,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)
    gssapi (1.2.0)
      ffi (>= 1.0.1)
    haml (4.0.7)