diff options
| author | Nick Thomas <nick@gitlab.com> | 2019-04-24 12:12:23 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2019-04-24 12:12:23 +0000 |
| commit | b458b4158019013e468e9478af76bbf5e2226b92 (patch) | |
| tree | fa46b52be89cd094f5af41cce621547114025d80 /Gemfile | |
| parent | 4f2005df1dc7ca91673ae4ed5ef35130c714ddd9 (diff) | |
| parent | 2066cb6cf40747068afcfa159a04a277f38ab804 (diff) | |
| download | gitlab-ce-b458b4158019013e468e9478af76bbf5e2226b92.tar.gz | |
Merge branch 'sh-upgrade-grpc-and-protobuf' into 'master'
Bump gRPC to 1.19.0 and protobuf to 3.7.1
See merge request gitlab-org/gitlab-ce!27086
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -418,9 +418,9 @@ end # Gitaly GRPC client gem 'gitaly-proto', '~> 1.19.0', require: 'gitaly' -gem 'grpc', '~> 1.15.0' +gem 'grpc', '~> 1.19.0' -gem 'google-protobuf', '~> 3.6' +gem 'google-protobuf', '~> 3.7.1' gem 'toml-rb', '~> 1.0.0', require: false |