Include development, test group in Gemfile for autopkgtest

debian/patches/0100-remove-development-test.patch

@@ -18,7 +18,7 @@ Bundler will fail when it can't find these locally
  
  gem 'batch-loader', '~> 1.4'
  
-@@ -331,68 +329,6 @@
+@@ -331,21 +329,6 @@
    gem 'raindrops', '~> 0.18'
  end
  
@@ -37,48 +37,13 @@ Bundler will fail when it can't find these locally
 -  gem 'thin', '~> 1.7.0'
 -end
 -
--group :development, :test do
--  gem 'bullet', '~> 6.0.2', require: !!ENV['ENABLE_BULLET']
--  gem 'pry-byebug', '~> 3.5.1', platform: :mri
--  gem 'pry-rails', '~> 0.3.4'
--
--  gem 'awesome_print', require: false
--
--  gem 'database_cleaner', '~> 1.7.0'
--  gem 'factory_bot_rails', '~> 5.1.0'
--  gem 'rspec-rails', '~> 4.0.0.beta3'
--
--  # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
--  gem 'minitest', '~> 5.11.0'
--
--  # Generate Fake data
--  gem 'ffaker', '~> 2.10'
--
--  gem 'spring', '~> 2.0.0'
--  gem 'spring-commands-rspec', '~> 1.0.4'
--
--  gem 'gitlab-styles', '~> 2.7', require: false
--  # Pin these dependencies, otherwise a new rule could break the CI pipelines
--  gem 'rubocop', '~> 0.69.0'
--  gem 'rubocop-performance', '~> 1.1.0'
--  gem 'rubocop-rspec', '~> 1.22.1'
--
--  gem 'scss_lint', '~> 0.56.0', require: false
--  gem 'haml_lint', '~> 0.34.0', require: false
--  gem 'simplecov', '~> 0.16.1', require: false
--  gem 'bundler-audit', '~> 0.5.0', require: false
--
--  gem 'benchmark-ips', '~> 2.3.0', require: false
--
--  gem 'knapsack', '~> 1.17'
--
--  gem 'stackprof', '~> 0.2.13', require: false
--
--  gem 'simple_po_parser', '~> 1.1.2', require: false
--
--  gem 'timecop', '~> 0.8.0'
--end
--
+ group :development, :test do
+   gem 'bullet', '~> 6.0.2', require: !!ENV['ENABLE_BULLET']
+   gem 'pry-byebug', '~> 3.5.1', platform: :mri
+@@ -388,11 +371,6 @@
+   gem 'timecop', '~> 0.8.0'
+ end
+ 
 -# Gems required in omnibus-gitlab pipeline
 -group :development, :test, :omnibus do
 -  gem 'license_finder', '~> 5.4', require: false

debian/patches/0110-make-test-dependencies-conditional.patch

@@ -4,8 +4,18 @@
    gem 'raindrops', '~> 0.18'
  end
  
--group :test do
+-group :development, :test do
 +if ENV["INCLUDE_TEST_DEPENDS"] == "true"
+   gem 'bullet', '~> 6.0.2', require: !!ENV['ENABLE_BULLET']
+   gem 'pry-byebug', '~> 3.5.1', platform: :mri
+   gem 'pry-rails', '~> 0.3.4'
+@@ -369,9 +369,6 @@
+   gem 'simple_po_parser', '~> 1.1.2', require: false
+ 
+   gem 'timecop', '~> 0.8.0'
+-end
+-
+-group :test do
    gem 'fuubar', '~> 2.2'
    gem 'rspec-retry', '~> 0.6.1'
    gem 'rspec_profiling', '~> 0.0.5'

debian/patches/0486-relax-grpc-protobuf.patch

@@ -1,6 +1,6 @@
 --- a/Gemfile
 +++ b/Gemfile
-@@ -379,9 +379,9 @@
+@@ -418,9 +418,9 @@
  # Gitaly GRPC protocol definitions
  gem 'gitaly', '~> 1.73'