Relax dependency on grpc and google-protobuf gems

This commit is contained in:
Pirate Praveen 2019-12-30 17:36:08 +05:30
parent 0db1ed4b34
commit cd1b3d5ac5
3 changed files with 17 additions and 2 deletions

4
debian/control vendored
View file

@ -312,7 +312,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
ruby-bcrypt-pbkdf (>= 1.0~), ruby-bcrypt-pbkdf (>= 1.0~),
# Gitaly GRPC client # Gitaly GRPC client
ruby-gitaly (>= 1.70+dfsg~), ruby-gitaly (>= 1.70+dfsg~),
ruby-grpc (>= 1.24~), ruby-grpc (>= 1.19~),
ruby-google-protobuf (>= 3.7~), ruby-google-protobuf (>= 3.7~),
# #
ruby-toml-rb (>= 1.0.0-2~), ruby-toml-rb (>= 1.0.0-2~),
@ -396,7 +396,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
# gitlab-sidekiq was failing without puma # gitlab-sidekiq was failing without puma
puma puma
Recommends: certbot, Recommends: certbot,
gitaly (>= 1.67.1+dfsg~) gitaly (>= 1.72.1+dfsg-2~)
Conflicts: libruby2.3 Conflicts: libruby2.3
Description: git powered software platform to collaborate on code (non-omnibus) Description: git powered software platform to collaborate on code (non-omnibus)
gitlab provides web based interface to host source code and track issues. gitlab provides web based interface to host source code and track issues.

View file

@ -0,0 +1,14 @@
--- a/Gemfile
+++ b/Gemfile
@@ -420,9 +420,9 @@
# Gitaly GRPC protocol definitions
gem 'gitaly', '~> 1.70'
-gem 'grpc', '~> 1.24'
+gem 'grpc', '~> 1.19'
-gem 'google-protobuf', '~> 3.8'
+gem 'google-protobuf', '~> 3.7'
gem 'toml-rb', '~> 1.0', require: false

View file

@ -15,6 +15,7 @@
0482-remove-ee-only-gems.patch 0482-remove-ee-only-gems.patch
0484-relax-asciidoctor-plantuml.patch 0484-relax-asciidoctor-plantuml.patch
0485-relax-responders.patch 0485-relax-responders.patch
0486-relax-grpc-protobuf.patch
0500-set-webpack-root.patch 0500-set-webpack-root.patch
0510-remove-dev-dependencies.patch 0510-remove-dev-dependencies.patch
0520-add-system-lib-path-for-webpack.patch 0520-add-system-lib-path-for-webpack.patch