diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-03-07 20:27:43 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-03-07 20:27:43 +0300 |
| commit | 2f6deb128a4270712aedd6feddee32c963080270 (patch) | |
| tree | 65d5470dfd3666e7ecb138067ecc5394c9e554af /Gemfile | |
| parent | 98c8c90e92f8f0407bf048d42ff5e4d76ce57ba0 (diff) | |
| parent | fdb50805f3c12829a9265575fb4f7329cd50bfa6 (diff) | |
Merge branch 'fix/upgrade-grpc-to-1-1-0' into 'master'
Upgrade grpc gem to 1.10.0
See merge request gitlab-org/gitlab-ce!17575
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -413,9 +413,7 @@ end # Gitaly GRPC client gem 'gitaly-proto', '~> 0.88.0', require: 'gitaly' -# Explicitly lock grpc as we know 1.9 is bad -# 1.10 is still being tested. See gitlab-org/gitaly#1059 -gem 'grpc', '~> 1.8.3' +gem 'grpc', '~> 1.10.0' # Locked until https://github.com/google/protobuf/issues/4210 is closed gem 'google-protobuf', '= 3.5.1' |