diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-09-15 18:43:28 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-09-15 18:43:28 +0000 |
| commit | 3dd2248605ce2183f02ab268fc1f8b0b164f0bed (patch) | |
| tree | 3a6698faaba559226e2596294f6332430de367df | |
| parent | cff8d9ac30bd0097ded0dfafc456bccac19a189e (diff) | |
| parent | ae63e9293911afb99bb428221eedbc08888d3a33 (diff) | |
| download | gitlab-ce-3dd2248605ce2183f02ab268fc1f8b0b164f0bed.tar.gz | |
Merge branch 'grpc-1.6' into 'master'
Use grpc 1.6.0
See merge request gitlab-org/gitlab-ce!14262
| -rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index bcbe6b4f394..e10db81d0c9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -357,7 +357,7 @@ GEM rake grape_logging (1.7.0) grape - grpc (1.4.5) + grpc (1.6.0) google-protobuf (~> 3.1) googleauth (~> 0.5.1) haml (4.0.7) |