about summary refs log tree commit diff
diff options
context:
space:
mode:
authorYamagishi Kazutoshi <ykzts@desire.sh>2019-06-05 02:35:19 +0900
committerEugen Rochko <eugen@zeonfederated.com>2019-06-04 19:35:19 +0200
commit121d19d7fa239c52ce86352d3fdae0649c892a20 (patch)
tree74ba6891061ebd4d2a4c01a3ebaad3d4073e7168
parenta1e96b2d8a3848794e8bdd9415bd13f64efb7207 (diff)
Revert #10957 (rubocop-rails) which is incompatible with CodeClimate (#10965)
-rw-r--r--.rubocop.yml3
-rw-r--r--Gemfile1
-rw-r--r--Gemfile.lock4
3 files changed, 0 insertions, 8 deletions
diff --git a/.rubocop.yml b/.rubocop.yml
index f34272734..f1095e022 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,6 +1,3 @@
-require:
-  - rubocop-rails
-
 AllCops:
   TargetRubyVersion: 2.3
   Exclude:
diff --git a/Gemfile b/Gemfile
index 4fd981f75..62d5ae1f7 100644
--- 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
index d8a68d8c9..2d451be83 100644
--- 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)