diff options
| author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2018-02-06 15:19:01 +0300 |
|---|---|---|
| committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2018-02-06 15:19:01 +0300 |
| commit | c3034c9411d7a3ebe7df35cdd6975e3d4334a6bc (patch) | |
| tree | 5f31ebc0a7e9b6c1f3071d94e804357ed79c1fa8 | |
| parent | 076af8b09493675e2736a4bbff0f020868cb5d41 (diff) | |
Downgrade google-protobuf
| -rw-r--r-- | CHANGELOG.md | 5 | ||||
| -rw-r--r-- | ruby/Gemfile | 3 | ||||
| -rw-r--r-- | ruby/Gemfile.lock | 3 |
3 files changed, 10 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index c8adb5f44..7e007726a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Gitaly changelog +UNRELEASED + +- Lock protobuf to 3.5.1 + https://gitlab.com/gitlab-org/gitaly/merge_requests/589 + v0.79.0 - Update the activesupport gem diff --git a/ruby/Gemfile b/ruby/Gemfile index af2dcd8e8..2b9544616 100644 --- a/ruby/Gemfile +++ b/ruby/Gemfile @@ -9,6 +9,9 @@ gem 'gollum-lib', '~> 4.2', require: false gem 'gollum-rugged_adapter', '~> 0.4.4', require: false gem 'grpc', '~> 1.8.0' +# Locked until https://github.com/google/protobuf/issues/4210 is closed +gem 'google-protobuf', '= 3.5.1' + group :development, :test do gem 'gitlab-styles', '~> 2.0.0', require: false gem 'rspec', require: false diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index ffe46835a..cb53bb101 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -49,7 +49,7 @@ GEM gollum-rugged_adapter (0.4.4) mime-types (>= 1.15) rugged (~> 0.25) - google-protobuf (3.5.1.2) + google-protobuf (3.5.1) googleapis-common-protos-types (1.0.1) google-protobuf (~> 3.0) googleauth (0.6.2) @@ -143,6 +143,7 @@ DEPENDENCIES gitlab-styles (~> 2.0.0) gollum-lib (~> 4.2) gollum-rugged_adapter (~> 0.4.4) + google-protobuf (= 3.5.1) grpc (~> 1.8.0) rdoc (~> 4.2) rspec |