Merge branch 'downgrade-grpc-to-1.4.5' into 'master'

Downgrade the grpc gem to 1.4.5 See merge request gitlab-org/gitlab-ce!15746

Merge branch 'downgrade-grpc-to-1.4.5' into 'master'
eb367297 · Sean McGivern · 0803a0b3 · 22c29b0e · eb367297
Commit eb367297 authored Dec 06, 2017 by Sean McGivern
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 5 deletions

Gemfile.lock Gemfile.lock +2 -5

No files found.
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -328,8 +328,6 @@ 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)
@@ -356,10 +354,9 @@ GEM
      rake
    grape_logging (1.7.0)
      grape
-    grpc (1.7.2)
+    grpc (1.4.5)
      google-protobuf (~> 3.1)
-      googleapis-common-protos-types (~> 1.0.0)
-      googleauth (>= 0.5.1, < 0.7)
+      googleauth (~> 0.5.1)
    haml (4.0.7)
      tilt
    haml_lint (0.26.0)