diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-04-28 17:13:07 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-04-28 17:13:07 +0000 |
| commit | bb3870ea0952654eea6693f7f422b88ca4deda05 (patch) | |
| tree | 77cc3f8c6c8c722f4b3b282e004b1e3fb6ca81cf | |
| parent | 1f47b570b93b64df8b365865431eef8d04cd79e4 (diff) | |
| parent | d72405b04726935e8090d396ebd827e751c1466e (diff) | |
| download | gitlab-ce-bb3870ea0952654eea6693f7f422b88ca4deda05.tar.gz | |
Merge branch 'grpc-1.2.5' into 'master'
Use grpc 1.2.5
Closes #31143 and gitaly#197
See merge request !10984
| -rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 52707628748..038d1f746b3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -330,7 +330,7 @@ GEM grape-entity (0.6.0) activesupport multi_json (>= 1.3.2) - grpc (1.1.2) + grpc (1.2.5) google-protobuf (~> 3.1) googleauth (~> 0.5.1) haml (4.0.7) |