diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-01-12 10:18:39 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-01-12 10:18:39 +0000 |
| commit | f9579df8617add53424f57c0feedfa601a77e923 (patch) | |
| tree | 825f2dc66c6a08a9a4ae0bfb36fc2c4ee6204f55 | |
| parent | 19d7a64a47ccbd1c10abd96de2698cc7e0c72275 (diff) | |
| parent | c99c481aa68057e4e50f95516754e094fce17284 (diff) | |
| download | gitlab-ce-f9579df8617add53424f57c0feedfa601a77e923.tar.gz | |
Merge branch 'grpc-1.8.3' into 'master'
Update the grpc gem to 1.8.3
See merge request gitlab-org/gitlab-ce!16354
| -rw-r--r-- | Gemfile.lock | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index cb6b0ebb3bc..8e31ac1f993 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -340,6 +340,8 @@ GEM representable (~> 3.0) retriable (>= 2.0, < 4.0) google-protobuf (3.4.1.1) + googleapis-common-protos-types (1.0.1) + google-protobuf (~> 3.0) googleauth (0.5.3) faraday (~> 0.12) jwt (~> 1.4) @@ -366,9 +368,10 @@ GEM rake grape_logging (1.7.0) grape - grpc (1.4.5) + grpc (1.8.3) google-protobuf (~> 3.1) - googleauth (~> 0.5.1) + googleapis-common-protos-types (~> 1.0.0) + googleauth (>= 0.5.1, < 0.7) haml (4.0.7) tilt haml_lint (0.26.0) |