diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-10-24 09:41:52 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-10-24 09:41:52 +0000 |
| commit | 3d77a9fb73d295a9edf1dcb3cc7835a6c858f486 (patch) | |
| tree | b6f438faa2c51e9ba58c7109c6c6229cf69d704f | |
| parent | 5522f0f4e5fcc54735c6588d17c935f9bc74c2f3 (diff) | |
| parent | 436d5b023b386fe3fcf6fbae8cd5959543d143f4 (diff) | |
| download | gitlab-ce-3d77a9fb73d295a9edf1dcb3cc7835a6c858f486.tar.gz | |
Merge branch 'sh-bump-protobuf-3.6' into 'master'
Bump google-protobuf to 3.6.1
See merge request gitlab-org/gitlab-ce!22559
| -rw-r--r-- | Gemfile | 3 | ||||
| -rw-r--r-- | Gemfile.lock | 4 | ||||
| -rw-r--r-- | Gemfile.rails5.lock | 4 |
3 files changed, 5 insertions, 6 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 diff --git a/Gemfile.lock b/Gemfile.lock index a39788bee9f..bf16bef4f32 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -303,7 +303,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) @@ -1005,7 +1005,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) 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) |