diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-12-06 14:52:33 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-12-06 14:52:33 +0300 |
| commit | eb3672975a1f5c5570c565cd5a81fdd2228010ca (patch) | |
| tree | 649d1059a1725f7f93635a415e8bcd51e02efc81 /Gemfile.lock | |
| parent | 0803a0b3cc6188adc51b034278085f3dba5b53b2 (diff) | |
| parent | 22c29b0e6d1331e167221925c4ee0d906f87837c (diff) | |
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
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 48e46e3fab0..16b7c0da8e6 100644 --- 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) |