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

[rails.git] / .rubocop.yml

diff --git a/.rubocop.yml b/.rubocop.yml
index 1c41c027a68b40d4e79fb07f081cd891ae31a731..ac29f4fc8769d9aec2d1142f33eef65bf698383e 100644 (file)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,11 +1,13 @@
 inherit_from: .rubocop_todo.yml
 
 require:
 inherit_from: .rubocop_todo.yml
 
 require:

+  - rubocop-minitest

   - rubocop-performance
   - rubocop-rails
 
 AllCops:
   - rubocop-performance
   - rubocop-rails
 
 AllCops:

-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.7
+  NewCops: enable

   Exclude:
     - 'vendor/**/*'
 
   Exclude:
     - 'vendor/**/*'
 


@@ -65,7 +67,8 @@ Style/Documentation:
   Enabled: false
 
 Style/FormatStringToken:
   Enabled: false
 
 Style/FormatStringToken:

-  EnforcedStyle: template
+  Exclude:
+    - 'config/routes.rb'

 
 Style/IfInsideElse:
   Enabled: false
 
 Style/IfInsideElse:
   Enabled: false