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

[rails.git] / .rubocop.yml

diff --git a/.rubocop.yml b/.rubocop.yml
index e1f1724e0f995623182ed9025b71b5dbdfd65bf5..55be8141cf31c53115cecdcbe08ffd8d266b9089 100644 (file)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -27,15 +27,34 @@ Rails:
 Layout/ExtraSpacing:
   AllowForAlignment: true
 
-Style/BracesAroundHashParameters:
-  EnforcedStyle: context_dependent
+Lint/PercentStringArray:
+  Exclude:
+    - 'config/initializers/secure_headers.rb'
+    - 'app/controllers/site_controller.rb'
 
-Style/FileName:
+Naming/FileName:
   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
 
@@ -60,19 +79,3 @@ Style/StringLiterals:
 
 Style/SymbolArray:
   EnforcedStyle: brackets
-
-Rails/ApplicationRecord:
-  Enabled: false
-
-Rails/HttpPositionalArguments:
-  Enabled: false
-
-Rails/SkipsModelValidations:
-  Exclude:
-    - 'db/migrate/*.rb'
-    - 'app/controllers/user_controller.rb'
-
-Lint/PercentStringArray:
-  Exclude:
-    - 'config/initializers/secure_headers.rb'
-    - 'app/controllers/site_controller.rb'