about summary refs log tree commit diff
path: root/.rubocop.yml
diff options
context:
space:
mode:
authorYamagishi Kazutoshi <ykzts@desire.sh>2019-06-06 19:31:48 +0900
committerEugen Rochko <eugen@zeonfederated.com>2019-06-06 12:31:48 +0200
commit70423ce81ff43919a96688257ae3517066e483b1 (patch)
treee6188601379739ffd8a63ad26c0cb78f62390d84 /.rubocop.yml
parentc402c291f4991e2b021d8c13b557e6a8f650dcf3 (diff)
require rubocop-rails in .rubocop.yml (#10974)
* Revert "Revert #10957 (rubocop-rails) which is incompatible with CodeClimate (#10965)"

This reverts commit 121d19d7fa239c52ce86352d3fdae0649c892a20.

* Disable Rails/HelperInstanceVariable
Diffstat (limited to '.rubocop.yml')
-rw-r--r--.rubocop.yml6
1 files changed, 6 insertions, 0 deletions
diff --git a/.rubocop.yml b/.rubocop.yml
index f1095e022..8bd4c867f 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,3 +1,6 @@
+require:
+  - rubocop-rails
+
 AllCops:
   TargetRubyVersion: 2.3
   Exclude:
@@ -82,6 +85,9 @@ Rails/Exit:
     - 'lib/mastodon/*'
     - 'lib/cli.rb'
 
+Rails/HelperInstanceVariable:
+  Enabled: false
+
 Style/ClassAndModuleChildren:
   Enabled: false