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

[rails.git] / .rubocop.yml

diff --git a/.rubocop.yml b/.rubocop.yml
index cb301ece1641571dcf263949f2aa7fa3e6cacdc8..b33f9046cb87c117925cc8e290392f2021aae270 100644 (file)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -45,7 +45,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