Revert #10957 (rubocop-rails) which is incompatible with CodeClimate (#10965)

diff --git a/.rubocop.yml b/.rubocop.yml
index f34272734c8c755d5eec05836874fb90321c9673..f1095e02245a996e1aafa1730f80546c3450a564 100644 (file)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,6 +1,3 @@
-require:
-  - rubocop-rails
-

 AllCops:
   TargetRubyVersion: 2.3
   Exclude:
 AllCops:
   TargetRubyVersion: 2.3
   Exclude:

diff --git a/Gemfile b/Gemfile
index 4fd981f753a97351250083cb63bea635d0264c7e..62d5ae1f74210017d4592e1aa1730c44b5176de3 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -129,7 +129,6 @@ group :development do
   gem 'letter_opener_web', '~> 1.3'
   gem 'memory_profiler'
   gem 'rubocop', '~> 0.71', require: false
   gem 'letter_opener_web', '~> 1.3'
   gem 'memory_profiler'
   gem 'rubocop', '~> 0.71', require: false

-  gem 'rubocop-rails', '~> 2.0', require: false

   gem 'brakeman', '~> 4.5', require: false
   gem 'bundler-audit', '~> 0.6', require: false
 
   gem 'brakeman', '~> 4.5', require: false
   gem 'bundler-audit', '~> 0.6', require: false
 

diff --git a/Gemfile.lock b/Gemfile.lock
index d8a68d8c9d8fcfbe770362f7c74e032b3a755813..2d451be83d5882db0ef0dbaaca1e2b461daae6c6 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -531,9 +531,6 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)

-    rubocop-rails (2.0.0)
-      rack (>= 2.0)
-      rubocop (>= 0.70.0)

     ruby-progressbar (1.10.1)
     ruby-saml (1.9.0)
       nokogiri (>= 1.5.10)
     ruby-progressbar (1.10.1)
     ruby-saml (1.9.0)
       nokogiri (>= 1.5.10)


@@ -738,7 +735,6 @@ DEPENDENCIES
   rspec-rails (~> 3.8)
   rspec-sidekiq (~> 3.0)
   rubocop (~> 0.71)
   rspec-rails (~> 3.8)
   rspec-sidekiq (~> 3.0)
   rubocop (~> 0.71)

-  rubocop-rails (~> 2.0)

   sanitize (~> 5.0)
   sidekiq (~> 5.2)
   sidekiq-bulk (~> 0.2.0)
   sanitize (~> 5.0)
   sidekiq (~> 5.2)
   sidekiq-bulk (~> 0.2.0)