diff options
| author | Winnie Hellmann <winnie@gitlab.com> | 2017-11-23 08:08:26 +0000 |
|---|---|---|
| committer | Winnie Hellmann <winnie@gitlab.com> | 2017-11-23 08:08:26 +0000 |
| commit | 1ff9e796f8df3d274cc7a6b845b8266055e5a936 (patch) | |
| tree | 048aefd90848d5debb928d96e82deefd1eb42b6d | |
| parent | 40af088811fe463a7b82aa0e154702416a061287 (diff) | |
| download | gitlab-ce-1ff9e796f8df3d274cc7a6b845b8266055e5a936.tar.gz | |
Revert "Merge branch 'grpc-update' into 'master'"
This reverts commit ac2c670de0fd28df354d75f959e6f03f540e53e0
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 36e85f8744a..ae145ca5f69 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -354,10 +354,10 @@ GEM rake grape_logging (1.7.0) grape - grpc (1.7.2) + grpc (1.6.6) 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) |