diff options
| author | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2018-02-06 16:58:04 +0000 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2018-02-06 16:58:04 +0000 |
| commit | 9f152630aa162cc6e7a66d9087687c605b669514 (patch) | |
| tree | 207db74c6038f1486787973ab7caf8c04c0bb91e | |
| parent | e8e4e3fcbe8d63a06e29f48719d70ee94d220281 (diff) | |
| download | gitlab-ce-9f152630aa162cc6e7a66d9087687c605b669514.tar.gz | |
Downgrade google-protobuf
| -rw-r--r-- | GITALY_SERVER_VERSION | 2 | ||||
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 3 | ||||
| -rw-r--r-- | changelogs/unreleased/zj-protobuf.yml | 5 |
4 files changed, 10 insertions, 2 deletions
diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index bd14e8533ef..b53d377d909 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -0.78.0 +0.80.0 @@ -411,6 +411,8 @@ end # Gitaly GRPC client gem 'gitaly-proto', '~> 0.83.0', require: 'gitaly' +# Locked until https://github.com/google/protobuf/issues/4210 is closed +gem 'google-protobuf', '= 3.5.1' gem 'toml-rb', '~> 0.3.15', require: false diff --git a/Gemfile.lock b/Gemfile.lock index cf9f160499d..e78c3c5f794 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -340,7 +340,7 @@ GEM mime-types (~> 3.0) representable (~> 3.0) retriable (>= 2.0, < 4.0) - google-protobuf (3.5.1.1) + google-protobuf (3.5.1) googleapis-common-protos-types (1.0.1) google-protobuf (~> 3.0) googleauth (0.5.3) @@ -1066,6 +1066,7 @@ DEPENDENCIES gollum-rugged_adapter (~> 0.4.4) gon (~> 6.1.0) google-api-client (~> 0.13.6) + google-protobuf (= 3.5.1) gpgme grape (~> 1.0) grape-entity (~> 0.6.0) diff --git a/changelogs/unreleased/zj-protobuf.yml b/changelogs/unreleased/zj-protobuf.yml new file mode 100644 index 00000000000..830c2e82da9 --- /dev/null +++ b/changelogs/unreleased/zj-protobuf.yml @@ -0,0 +1,5 @@ +--- +title: Downgrade google-protobuf gem +merge_request: 16941 +author: +type: other |