Merge remote-tracking branch 'upstream/pull/2950' into master

[rails.git] / .rubocop.yml

diff --git a/.rubocop.yml b/.rubocop.yml
index 34605df1d8b821fe083d88b8caa07a3ea222562b..200ab8a00816b92077b78ea72c7908636d9a989e 100644 (file)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -6,7 +6,8 @@ require:
   - rubocop-rails
 
 AllCops:
   - rubocop-rails
 
 AllCops:

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

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


@@ -36,7 +37,6 @@ Metrics/ModuleLength:
 Naming/FileName:
   Exclude:
     - 'script/deliver-message'
 Naming/FileName:
   Exclude:
     - 'script/deliver-message'

-    - 'script/locale/reload-languages'

     - 'script/update-spam-blocks'
 
 Naming/MethodParameterName:
     - 'script/update-spam-blocks'
 
 Naming/MethodParameterName:


@@ -66,7 +66,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