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

[rails.git] / .rubocop.yml

diff --git a/.rubocop.yml b/.rubocop.yml
index 31c14773c1b0e994f215efa5f3916f9672434900..d5ee8ff383722193f5769416d431faea2c3521c4 100644 (file)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,7 +1,9 @@
 inherit_from: .rubocop_todo.yml
 
 inherit_from: .rubocop_todo.yml
 

+require: rubocop-performance
+

 AllCops:
 AllCops:

-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.5

 
 Rails:
   Enabled: true
 
 Rails:
   Enabled: true


@@ -45,7 +47,7 @@ Rails/InverseOf:
 Rails/SkipsModelValidations:
   Exclude:
     - 'db/migrate/*.rb'
 Rails/SkipsModelValidations:
   Exclude:
     - 'db/migrate/*.rb'

-    - 'app/controllers/user_controller.rb'
+    - 'app/controllers/users_controller.rb'

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


@@ -56,10 +58,6 @@ Style/FormatStringToken:
 Style/IfInsideElse:
   Enabled: false
 
 Style/IfInsideElse:
   Enabled: false
 

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

 Style/GuardClause:
   Enabled: false
 
 Style/GuardClause:
   Enabled: false