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

[rails.git] / .rubocop.yml

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

-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.7

   NewCops: enable
   Exclude:
     - 'vendor/**/*'
   NewCops: enable
   Exclude:
     - 'vendor/**/*'


@@ -37,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:


@@ -67,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