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

[rails.git] / .rubocop.yml

diff --git a/.rubocop.yml b/.rubocop.yml
index a0533b162da42b0d3aebdd7077258226f5d0b1fe..213eb27aae9a6d490cf78e0b8f9f9401ae2c060f 100644 (file)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,14 +1,24 @@
 inherit_from: .rubocop_todo.yml
 
+AllCops:
+   RunRailsCops: 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/GlobalVars:
+  Exclude:
+    - 'lib/quad_tile/extconf.rb'
+    
 Style/HashSyntax:
   EnforcedStyle: hash_rockets
   Exclude: