Commit 309a5f15 authored by Sean McGivern's avatar Sean McGivern

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

Downgrade the grpc gem to 1.4.5

See merge request gitlab-org/gitlab-ee!3642
parents bb6767e5 d2042b91
...@@ -353,8 +353,6 @@ GEM ...@@ -353,8 +353,6 @@ GEM
representable (~> 3.0) representable (~> 3.0)
retriable (>= 2.0, < 4.0) retriable (>= 2.0, < 4.0)
google-protobuf (3.4.1.1) google-protobuf (3.4.1.1)
googleapis-common-protos-types (1.0.0)
google-protobuf (~> 3.0)
googleauth (0.5.3) googleauth (0.5.3)
faraday (~> 0.12) faraday (~> 0.12)
jwt (~> 1.4) jwt (~> 1.4)
...@@ -381,10 +379,9 @@ GEM ...@@ -381,10 +379,9 @@ GEM
rake rake
grape_logging (1.7.0) grape_logging (1.7.0)
grape grape
grpc (1.7.2) grpc (1.4.5)
google-protobuf (~> 3.1) 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) gssapi (1.2.0)
ffi (>= 1.0.1) ffi (>= 1.0.1)
haml (4.0.7) haml (4.0.7)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment