about summary refs log tree commit diff
diff options
context:
space:
mode:
authorYamagishi Kazutoshi <ykzts@desire.sh>2019-06-04 22:25:52 +0900
committerEugen Rochko <eugen@zeonfederated.com>2019-06-04 15:25:52 +0200
commit3f536f06d63aca19ce2d06fce1ff94ee5f3ed7c8 (patch)
tree7c6e493a773064481d36ea317b1b742149d3ce56
parentda38c0a6b8e47327a8fca97ee977d20d8d31afad (diff)
Use rubocop-rails (#10957)
-rw-r--r--.codeclimate.yml2
-rw-r--r--.rubocop.yml3
-rw-r--r--Gemfile1
-rw-r--r--Gemfile.lock4
4 files changed, 9 insertions, 1 deletions
diff --git a/.codeclimate.yml b/.codeclimate.yml
index a70459764..143b12330 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -30,7 +30,7 @@ plugins:
     channel: eslint-5
   rubocop:
     enabled: true
-    channel: rubocop-0-54
+    channel: rubocop-0-71
   scss-lint:
     enabled: true
 exclude_patterns:
diff --git a/.rubocop.yml b/.rubocop.yml
index f1095e022..f34272734 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,3 +1,6 @@
+require:
+  - rubocop-rails
+
 AllCops:
   TargetRubyVersion: 2.3
   Exclude:
diff --git a/Gemfile b/Gemfile
index 496c1baf4..852e184b2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -129,6 +129,7 @@ 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
   gem 'scss_lint', '~> 0.58', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 30ee4c481..75257133d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -534,6 +534,9 @@ 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)
@@ -746,6 +749,7 @@ DEPENDENCIES
   rspec-rails (~> 3.8)
   rspec-sidekiq (~> 3.0)
   rubocop (~> 0.71)
+  rubocop-rails (~> 2.0)
   sanitize (~> 5.0)
   scss_lint (~> 0.58)
   sidekiq (~> 5.2)