diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-10-24 01:53:12 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-10-24 01:53:12 -0700 |
| commit | 436d5b023b386fe3fcf6fbae8cd5959543d143f4 (patch) | |
| tree | b6f438faa2c51e9ba58c7109c6c6229cf69d704f /Gemfile | |
| parent | 5522f0f4e5fcc54735c6588d17c935f9bc74c2f3 (diff) | |
| download | gitlab-ce-436d5b023b386fe3fcf6fbae8cd5959543d143f4.tar.gz | |
Bump google-protobuf to 3.6.1
It looks like gRPC may have worked around
https://github.com/google/protobuf/issues/4210 via
https://github.com/grpc/grpc/pull/14634.
This is needed to support Ruby 2.5
(https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22555).
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -417,8 +417,7 @@ end gem 'gitaly-proto', '~> 0.118.1', require: 'gitaly' gem 'grpc', '~> 1.15.0' -# Locked until https://github.com/google/protobuf/issues/4210 is closed -gem 'google-protobuf', '= 3.5.1' +gem 'google-protobuf', '~> 3.6' gem 'toml-rb', '~> 1.0.0', require: false |