Merge remote-tracking branch 'openstreetmap/pull/1352'

[rails.git] / .rubocop.yml

diff --git a/.rubocop.yml b/.rubocop.yml
index 555d76d36117bf86fbef9ebb1a26615dc99983ab..975457d9572a6670386e154be340781a44913299 100644 (file)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,13 +1,42 @@
 inherit_from: .rubocop_todo.yml
 
+AllCops:
+  Include:
+    - '**/*.builder'
+
+Rails:
+  Enabled: true
+
 Style/BracesAroundHashParameters:
   EnforcedStyle: context_dependent
 
+Style/ExtraSpacing:
+  AllowForAlignment: true
+
 Style/FileName:
   Exclude:
     - 'script/deliver-message'
     - 'script/locale/reload-languages'
     - 'script/update-spam-blocks'
 
+Style/IfInsideElse:
+  Enabled: false
+
+Style/GlobalVars:
+  Exclude:
+    - 'lib/quad_tile/extconf.rb'
+
+Style/GuardClause:
+  Enabled: false
+
+Style/HashSyntax:
+  EnforcedStyle: hash_rockets
+  Exclude:
+    - 'lib/tasks/testing.rake'
+    - 'config/initializers/wrap_parameters.rb'
+
 Style/StringLiterals:
   EnforcedStyle: double_quotes
+
+Rails/HttpPositionalArguments:
+  Enabled: false