Merge remote-tracking branch 'upstream/pull/3195'

[rails.git] / .rubocop.yml

diff --git a/.rubocop.yml b/.rubocop.yml
index 34605df1d8b821fe083d88b8caa07a3ea222562b..1931eb55ff73af4121df66e05b96f90b383f0c4f 100644 (file)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -4,9 +4,11 @@ require:
   - rubocop-minitest
   - rubocop-performance
   - rubocop-rails
+  - rubocop-rake
 
 AllCops:
   TargetRubyVersion: 2.5
+  NewCops: enable
   Exclude:
     - 'vendor/**/*'
 
@@ -36,7 +38,6 @@ Metrics/ModuleLength:
 Naming/FileName:
   Exclude:
     - 'script/deliver-message'
-    - 'script/locale/reload-languages'
     - 'script/update-spam-blocks'
 
 Naming/MethodParameterName:
@@ -66,7 +67,8 @@ Style/Documentation:
   Enabled: false
 
 Style/FormatStringToken:
-  EnforcedStyle: template
+  Exclude:
+    - 'config/routes.rb'
 
 Style/IfInsideElse:
   Enabled: false