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

[rails.git] / .rubocop.yml

diff --git a/.rubocop.yml b/.rubocop.yml
index cb301ece1641571dcf263949f2aa7fa3e6cacdc8..d5ee8ff383722193f5769416d431faea2c3521c4 100644 (file)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,7 +1,9 @@
 inherit_from: .rubocop_todo.yml
 
+require: rubocop-performance
+
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.5
 
 Rails:
   Enabled: true
@@ -45,7 +47,7 @@ Rails/InverseOf:
 Rails/SkipsModelValidations:
   Exclude:
     - 'db/migrate/*.rb'
-    - 'app/controllers/user_controller.rb'
+    - 'app/controllers/users_controller.rb'
 
 Style/BracesAroundHashParameters:
   EnforcedStyle: context_dependent