From 70423ce81ff43919a96688257ae3517066e483b1 Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Thu, 6 Jun 2019 19:31:48 +0900
Subject: 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
---
 .rubocop.yml | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to '.rubocop.yml')

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
 
-- 
cgit