Merge branch 'grpc-1.6.6' into 'master'

Use grpc 1.6.6 See merge request gitlab-org/gitlab-ce!14821

Merge branch 'grpc-1.6.6' into 'master'
5e0fca33 · Rémy Coutable · 6cf3049f · ed1c8389 · 5e0fca33
Commit 5e0fca33 authored Oct 13, 2017 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

Gemfile.lock Gemfile.lock +4 -1

No files found.
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -325,6 +325,8 @@ GEM
      representable (~> 3.0)
      retriable (>= 2.0, < 4.0)
    google-protobuf (3.4.1.1)
+    googleapis-common-protos-types (1.0.0)
+      google-protobuf (~> 3.0)
    googleauth (0.5.3)
      faraday (~> 0.12)
      jwt (~> 1.4)
@@ -351,8 +353,9 @@ GEM
      rake
    grape_logging (1.7.0)
      grape
-    grpc (1.6.0)
+    grpc (1.6.6)
      google-protobuf (~> 3.1)
+      googleapis-common-protos-types (~> 1.0.0)
      googleauth (~> 0.5.1)
    haml (4.0.7)
      tilt