relax google-protobuf

This commit is contained in:
Pirate Praveen 2018-03-19 14:09:54 +05:30
parent ee91b49906
commit 7184853716
2 changed files with 12 additions and 0 deletions

View file

@ -0,0 +1,11 @@
--- a/Gemfile
+++ b/Gemfile
@@ -397,7 +397,7 @@
# Gitaly GRPC client
gem 'gitaly-proto', '~> 0.84', require: 'gitaly'
# Locked until https://github.com/google/protobuf/issues/4210 is closed
-gem 'google-protobuf', '= 3.5.1'
+gem 'google-protobuf', '~> 3.2'
gem 'toml-rb', '>= 0.3.15', require: false

View file

@ -18,6 +18,7 @@ pid-log-paths.patch
0370-relax-prof.patch 0370-relax-prof.patch
0380-relax-google-api-client.patch 0380-relax-google-api-client.patch
0390-relax-gitaly-proto.patch 0390-relax-gitaly-proto.patch
0391-relax-google-protobuf.patch
0410-set-webpack-root.patch 0410-set-webpack-root.patch
0420-use-system-libs.patch 0420-use-system-libs.patch
890757.patch 890757.patch