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.rails5.lock | |
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.rails5.lock')
-rw-r--r-- | Gemfile.rails5.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.rails5.lock b/Gemfile.rails5.lock index 1421edb1d39..81547303ed2 100644 --- a/Gemfile.rails5.lock +++ b/Gemfile.rails5.lock @@ -306,7 +306,7 @@ GEM mime-types (~> 3.0) representable (~> 3.0) retriable (>= 2.0, < 4.0) - google-protobuf (3.5.1) + google-protobuf (3.6.1) googleapis-common-protos-types (1.0.2) google-protobuf (~> 3.0) googleauth (0.6.6) @@ -1014,7 +1014,7 @@ DEPENDENCIES gitlab_omniauth-ldap (~> 2.0.4) gon (~> 6.2) google-api-client (~> 0.23) - google-protobuf (= 3.5.1) + google-protobuf (~> 3.6) gpgme grape (~> 1.1) grape-entity (~> 0.7.1) |