]> git.openstreetmap.org Git - rails.git/blobdiff - .rubocop.yml
Merge remote-tracking branch 'upstream/pull/2111'
[rails.git] / .rubocop.yml
index 31c14773c1b0e994f215efa5f3916f9672434900..b33f9046cb87c117925cc8e290392f2021aae270 100644 (file)
@@ -45,7 +45,7 @@ Rails/InverseOf:
 Rails/SkipsModelValidations:
   Exclude:
     - 'db/migrate/*.rb'
-    - 'app/controllers/user_controller.rb'
+    - 'app/controllers/users_controller.rb'
 
 Style/BracesAroundHashParameters:
   EnforcedStyle: context_dependent
@@ -56,10 +56,6 @@ Style/FormatStringToken:
 Style/IfInsideElse:
   Enabled: false
 
-Style/GlobalVars:
-  Exclude:
-    - 'lib/quad_tile/extconf.rb'
-
 Style/GuardClause:
   Enabled: false