From 780a54263c18340972653e19678f1af86ab5e810 Mon Sep 17 00:00:00 2001
From: Pirate Praveen <praveen@debian.org>
Date: Fri, 28 Feb 2020 12:49:51 +0530
Subject: [PATCH] Remove lint and style checks gems

---
 debian/patches/0050-relax-stable-libs.patch   | 47 +++++++++++++++++++
 .../0100-remove-development-test.patch        | 26 ++++++++--
 ...0-make-test-dependencies-conditional.patch |  8 ++--
 debian/patches/0486-relax-grpc-protobuf.patch |  2 +-
 4 files changed, 74 insertions(+), 9 deletions(-)

diff --git a/debian/patches/0050-relax-stable-libs.patch b/debian/patches/0050-relax-stable-libs.patch
index 5fa4fd83a5..f824045448 100644
--- a/debian/patches/0050-relax-stable-libs.patch
+++ b/debian/patches/0050-relax-stable-libs.patch
@@ -320,6 +320,53 @@ gitlab Gemfile
  
  # Perf bar
  gem 'peek', '~> 1.1'
+@@ -348,23 +348,23 @@
+ 
+ group :development, :test do
+   gem 'bullet', '~> 6.0.2', require: !!ENV['ENABLE_BULLET']
+-  gem 'pry-byebug', '~> 3.5.1', platform: :mri
++  gem 'pry-byebug', '~> 3.5', '>= 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'
++  gem 'database_cleaner', '~> 1.7'
++  gem 'factory_bot_rails', '~> 5.1'
++  gem 'rspec-rails', '~> 4.0', '>= 4.0.0.beta3'
+ 
+   # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
+-  gem 'minitest', '~> 5.11.0'
++  gem 'minitest', '~> 5.11'
+ 
+   # Generate Fake data
+   gem 'ffaker', '~> 2.10'
+ 
+-  gem 'spring', '~> 2.0.0'
+-  gem 'spring-commands-rspec', '~> 1.0.4'
++  gem 'spring', '~> 2.0'
++  gem 'spring-commands-rspec', '~> 1.0', '>= 1.0.4'
+ 
+   gem 'gitlab-styles', '~> 2.7', require: false
+   # Pin these dependencies, otherwise a new rule could break the CI pipelines
+@@ -377,13 +377,13 @@
+   gem 'simplecov', '~> 0.16.1', require: false
+   gem 'bundler-audit', '~> 0.5.0', require: false
+ 
+-  gem 'benchmark-ips', '~> 2.3.0', require: false
++  gem 'benchmark-ips', '~> 2.3', require: false
+ 
+   gem 'knapsack', '~> 1.17'
+ 
+   gem 'stackprof', '~> 0.2.13', require: false
+ 
+-  gem 'simple_po_parser', '~> 1.1.2', require: false
++  gem 'simple_po_parser', '~> 1.1', '>= 1.1.2', require: false
+ 
+   gem 'timecop', '~> 0.8.0'
+ end
 @@ -394,20 +394,20 @@
  end
  
diff --git a/debian/patches/0100-remove-development-test.patch b/debian/patches/0100-remove-development-test.patch
index 8f3fd79d99..24707bfb7d 100644
--- a/debian/patches/0100-remove-development-test.patch
+++ b/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,21 +329,6 @@
+@@ -331,23 +329,7 @@
    gem 'raindrops', '~> 0.18'
  end
  
@@ -38,9 +38,27 @@ Bundler will fail when it can't find these locally
 -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 'bullet', '~> 6.0.2', require: !!ENV['ENABLE_BULLET']
+   gem 'pry-byebug', '~> 3.5', '>= 3.5.1', platform: :mri
+   gem 'pry-rails', '~> 0.3.4'
+ 
+@@ -367,15 +349,6 @@
+   gem 'spring-commands-rspec', '~> 1.0', '>= 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', require: false
+ 
+@@ -388,11 +361,6 @@
    gem 'timecop', '~> 0.8.0'
  end
  
diff --git a/debian/patches/0110-make-test-dependencies-conditional.patch b/debian/patches/0110-make-test-dependencies-conditional.patch
index 0782e51539..6d5f2c980b 100644
--- a/debian/patches/0110-make-test-dependencies-conditional.patch
+++ b/debian/patches/0110-make-test-dependencies-conditional.patch
@@ -6,11 +6,11 @@
  
 -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-byebug', '~> 3.5', '>= 3.5.1', platform: :mri
    gem 'pry-rails', '~> 0.3.4'
-@@ -369,9 +369,6 @@
-   gem 'simple_po_parser', '~> 1.1.2', require: false
+ 
+@@ -359,9 +359,6 @@
+   gem 'simple_po_parser', '~> 1.1', '>= 1.1.2', require: false
  
    gem 'timecop', '~> 0.8.0'
 -end
diff --git a/debian/patches/0486-relax-grpc-protobuf.patch b/debian/patches/0486-relax-grpc-protobuf.patch
index e15fd27f08..34b9dd3549 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
-@@ -418,9 +418,9 @@
+@@ -408,9 +408,9 @@
  # Gitaly GRPC protocol definitions
  gem 'gitaly', '~> 1.73'