diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-10-13 12:46:31 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-10-13 12:46:31 +0000 |
| commit | 5e0fca33220708e16f3862aa93b49fade8d719a5 (patch) | |
| tree | 739a40cb11e7bb8daba25dbc0a9568f01f4b7ce0 | |
| parent | 6cf3049f486e81d40d62cc611cb757793a2dd60f (diff) | |
| parent | ed1c83896eea640edbabcc491d825024aea5e301 (diff) | |
| download | gitlab-ce-5e0fca33220708e16f3862aa93b49fade8d719a5.tar.gz | |
Merge branch 'grpc-1.6.6' into 'master'
Use grpc 1.6.6
See merge request gitlab-org/gitlab-ce!14821
| -rw-r--r-- | Gemfile.lock | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index b8b8054ad74..345fc0a9ac0 100644 --- 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 |