Update to iD v2.1.2

[rails.git] / .rubocop.yml

diff --git a/.rubocop.yml b/.rubocop.yml
index 213eb27aae9a6d490cf78e0b8f9f9401ae2c060f..477b2ab02c152e3af3488a62eb8c0b79040d1db3 100644 (file)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,7 +1,28 @@
 inherit_from: .rubocop_todo.yml
 
 AllCops:
 inherit_from: .rubocop_todo.yml
 
 AllCops:

-   RunRailsCops: true
+  Include:
+    - '**/*.gemspec'
+    - '**/*.podspec'
+    - '**/*.jbuilder'
+    - '**/*.rake'
+    - '**/*.opal'
+    - '**/config.ru'
+    - '**/Gemfile'
+    - '**/Rakefile'
+    - '**/Capfile'
+    - '**/Guardfile'
+    - '**/Podfile'
+    - '**/Thorfile'
+    - '**/Vagrantfile'
+    - '**/Berksfile'
+    - '**/Cheffile'
+    - '**/Vagabondfile'
+    - '**/Fastfile'
+    - '**/*.builder'
+
+Rails:
+  Enabled: true

 
 Style/BracesAroundHashParameters:
   EnforcedStyle: context_dependent
 
 Style/BracesAroundHashParameters:
   EnforcedStyle: context_dependent


@@ -15,10 +36,16 @@ Style/FileName:
     - 'script/locale/reload-languages'
     - 'script/update-spam-blocks'
 
     - 'script/locale/reload-languages'
     - 'script/update-spam-blocks'
 

+Style/IfInsideElse:
+  Enabled: false
+

 Style/GlobalVars:
   Exclude:
     - 'lib/quad_tile/extconf.rb'
 Style/GlobalVars:
   Exclude:
     - 'lib/quad_tile/extconf.rb'

-    
+
+Style/GuardClause:
+  Enabled: false
+

 Style/HashSyntax:
   EnforcedStyle: hash_rockets
   Exclude:
 Style/HashSyntax:
   EnforcedStyle: hash_rockets
   Exclude:


@@ -27,3 +54,11 @@ 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'