diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-11-21 00:11:06 +0000 |
|---|---|---|
| committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2017-11-23 01:33:19 +0000 |
| commit | ac2c670de0fd28df354d75f959e6f03f540e53e0 (patch) | |
| tree | e5f210b88139ea5676c74dc6106bff47f549ead5 | |
| parent | 88ce409dbf9e2789cfb769e8cefa9655c4866920 (diff) | |
| download | gitlab-ce-ac2c670de0fd28df354d75f959e6f03f540e53e0.tar.gz | |
Merge branch 'grpc-update' into 'master'
Update gRPC to v1.7.2
Closes gitaly#742
See merge request gitlab-org/gitlab-ce!15439
(cherry picked from commit 9a8f094e34e9f6da5932f239a510abcd996a79b3)
473ae04d Update gRPC to v1.7.2
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index ae145ca5f69..36e85f8744a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -354,10 +354,10 @@ GEM rake grape_logging (1.7.0) grape - grpc (1.6.6) + grpc (1.7.2) google-protobuf (~> 3.1) googleapis-common-protos-types (~> 1.0.0) - googleauth (~> 0.5.1) + googleauth (>= 0.5.1, < 0.7) haml (4.0.7) tilt haml_lint (0.26.0) |