Update to iD v2.6.0

[rails.git] / .rubocop.yml

diff --git a/.rubocop.yml b/.rubocop.yml
index 5bae96caa33e1f8d40c1c85284247d442eb87833..55be8141cf31c53115cecdcbe08ffd8d266b9089 100644 (file)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -24,18 +24,40 @@ AllCops:
 Rails:
   Enabled: true
 
 Rails:
   Enabled: true
 

-Style/BracesAroundHashParameters:
-  EnforcedStyle: context_dependent
-
-Style/ExtraSpacing:
+Layout/ExtraSpacing:

   AllowForAlignment: true
 
   AllowForAlignment: true
 

-Style/FileName:
+Lint/PercentStringArray:
+  Exclude:
+    - 'config/initializers/secure_headers.rb'
+    - 'app/controllers/site_controller.rb'
+
+Naming/FileName:

   Exclude:
     - 'script/deliver-message'
     - 'script/locale/reload-languages'
     - 'script/update-spam-blocks'
 
   Exclude:
     - 'script/deliver-message'
     - 'script/locale/reload-languages'
     - 'script/update-spam-blocks'
 

+Rails/ApplicationRecord:
+  Enabled: false
+
+Rails/HasManyOrHasOneDependent:
+  Enabled: false
+
+Rails/HttpPositionalArguments:
+  Enabled: false
+
+Rails/SkipsModelValidations:
+  Exclude:
+    - 'db/migrate/*.rb'
+    - 'app/controllers/user_controller.rb'
+
+Style/BracesAroundHashParameters:
+  EnforcedStyle: context_dependent
+
+Style/FormatStringToken:
+  EnforcedStyle: template
+

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


@@ -55,14 +77,5 @@ Style/HashSyntax:
 Style/StringLiterals:
   EnforcedStyle: double_quotes
 
 Style/StringLiterals:
   EnforcedStyle: double_quotes
 

-Rails/HttpPositionalArguments:
-  Enabled: false
-
-Rails/SkipsModelValidations:
-  Exclude:
-    - 'db/migrate/*.rb'
-    - 'app/controllers/user_controller.rb'
-
-Lint/PercentStringArray:
-  Exclude:
-    - 'config/initializers/secure_headers.rb'
+Style/SymbolArray:
+  EnforcedStyle: brackets