diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-26 09:22:49 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-26 09:22:49 +0000 |
| commit | 36cd2baaa33251047c91f47da247cd4a10aa3d66 (patch) | |
| tree | a17ef448d4dc7086ee6cbf6c82a0bca2deb346c9 | |
| parent | 55f4869a39ffb62c765e0014c36b81261c7c78a9 (diff) | |
| parent | e7afde0c9c63e657c71368cbed306f7fdb9826ac (diff) | |
| download | gitlab-ce-36cd2baaa33251047c91f47da247cd4a10aa3d66.tar.gz | |
Merge branch 'grpc-1.4' into 'master'
Use grpc 1.4.0
Closes omnibus-gitlab#2414
See merge request !12387
| -rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 4715363c5b8..7c9dd051211 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -352,7 +352,7 @@ GEM grape-entity (0.6.0) activesupport multi_json (>= 1.3.2) - grpc (1.2.5) + grpc (1.4.0) google-protobuf (~> 3.1) googleauth (~> 0.5.1) haml (4.0.7) |