ruby2.0->ruby 2.3

[rails.git] / .rubocop.yml

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

-   RunRailsCops: true
+  Include:
+    - '**/*.builder'
+
+Rails:
+  Enabled: true

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


@@ -15,10 +19,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 +37,6 @@ Style/HashSyntax:
 
 Style/StringLiterals:
   EnforcedStyle: double_quotes
 
 Style/StringLiterals:
   EnforcedStyle: double_quotes

+
+Rails/HttpPositionalArguments:
+  Enabled: false