relax gitaly-proto

2018-03-19 12:58:49 +05:30 · 2018-03-19 12:58:49 +05:30 · 1d65a303f5
commit 1d65a303f5
parent 1dcbb7ad35
2 changed files with 12 additions and 0 deletions
--- a/debian/patches/0390-relax-gitaly-proto.patch
+++ b/debian/patches/0390-relax-gitaly-proto.patch
@ -0,0 +1,11 @@
+--- a/Gemfile
+++ b/Gemfile
+@@ -395,7 +395,7 @@
+ end
+ 
+ # Gitaly GRPC client
+-gem 'gitaly-proto', '~> 0.84.0', require: 'gitaly'
+gem 'gitaly-proto', '~> 0.84', require: 'gitaly'
+ # Locked until https://github.com/google/protobuf/issues/4210 is closed
+ gem 'google-protobuf', '= 3.5.1'
+ 
--- a/debian/patches/series
+++ b/debian/patches/series
@ -17,6 +17,7 @@ pid-log-paths.patch
 0360-relax-rdoc.patch
 0370-relax-prof.patch
 0380-relax-google-api-client.patch
+0390-relax-gitaly-proto.patch
 0410-set-webpack-root.patch
 0420-use-system-libs.patch
 890757.patch