summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-04-12 10:42:21 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-04-12 10:42:21 +0000
commita0d734c9e69b3d09b0727605b01a0a55ab34ca16 (patch)
tree24a25c100a25cba977a77d6311345f6f3aef00ed
parent59f81b4ff80862fb7649eba461ba588d6cfee9ec (diff)
parente46f67a5123433f132da28770e4027542062fc81 (diff)
downloadgitlab-ce-a0d734c9e69b3d09b0727605b01a0a55ab34ca16.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.lock2
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)