diff --git a/debian/patches/0110-make-test-dependencies-conditional.patch b/debian/patches/0110-make-test-dependencies-conditional.patch index 74393fba6f..b2f852d3c0 100644 --- a/debian/patches/0110-make-test-dependencies-conditional.patch +++ b/debian/patches/0110-make-test-dependencies-conditional.patch @@ -1,14 +1,15 @@ --- a/Gemfile +++ b/Gemfile -@@ -330,6 +330,7 @@ +@@ -329,7 +329,7 @@ + gem 'raindrops', '~> 0.18' end - group :development, :test do +-group :development, :test do +if ENV["INCLUDE_TEST_DEPENDS"] == "true" gem 'pry-byebug', '~> 3.5', platform: :mri gem 'pry-rails', '~> 0.3.9' -@@ -361,9 +362,6 @@ +@@ -361,9 +361,6 @@ gem 'png_quantizator', '~> 0.2.1', require: false gem 'parallel', '~> 1.19', require: false diff --git a/debian/patches/0486-relax-grpc-protobuf.patch b/debian/patches/0486-relax-grpc-protobuf.patch index c71ebd1ad9..1dfe441da5 100644 --- a/debian/patches/0486-relax-grpc-protobuf.patch +++ b/debian/patches/0486-relax-grpc-protobuf.patch @@ -1,6 +1,6 @@ --- a/Gemfile +++ b/Gemfile -@@ -412,9 +412,9 @@ +@@ -411,9 +411,9 @@ # Gitaly GRPC protocol definitions gem 'gitaly', '~> 1.86'