Revert mastodon#10957 (rubocop-rails) which is incompatible with Code…

…Climate (mastodon#10965)
Origin-Creative · Jun 4, 2019 · 0f21687 · 0f21687
1 parent 29a9acc
commit 0f21687
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 8 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -1,6 +1,3 @@
-require:
-  - rubocop-rails
-
 AllCops:
   TargetRubyVersion: 2.3
   Exclude:

diff --git 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 'rubocop-rails', '~> 2.0', require: false
   gem 'brakeman', '~> 4.5', require: false
   gem 'bundler-audit', '~> 0.6', require: false
 

diff --git 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)
-    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)
@@ -738,7 +735,6 @@ DEPENDENCIES
   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)