diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-04-12 10:42:21 +0000 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-04-13 20:09:15 +0800 |
| commit | f99a8f66babb068b27887cddb9733420af6fc959 (patch) | |
| tree | 2877d393c1ee2f0f144887fa049158cf7e66e5e4 | |
| parent | e683b8d17d5028e4936434723a62165bddaee049 (diff) | |
| download | gitlab-ce-f99a8f66babb068b27887cddb9733420af6fc959.tar.gz | |
Merge branch 'grpc-1.2.2' into 'master'
Use gRPC 1.2.2
Closes #30766
See merge request !10589
| -rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index d7e3f7343d0..965c888ca79 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.2) google-protobuf (~> 3.1) googleauth (~> 0.5.1) haml (4.0.7) |