Merge branch 'master' into next
[rails.git] / .rubocop_todo.yml
index 5846de44f47d987a1bf16d6f67a19dd7227617e2..da801d681ab11b8071dcf50a836d3b884cb36ccd 100644 (file)
@@ -33,9 +33,9 @@ Lint/AssignmentInCondition:
     - 'app/controllers/application_controller.rb'
     - 'app/controllers/geocoder_controller.rb'
     - 'app/controllers/notes_controller.rb'
-    - 'app/controllers/trace_controller.rb'
+    - 'app/controllers/traces_controller.rb'
     - 'app/controllers/user_controller.rb'
-    - 'app/controllers/user_preference_controller.rb'
+    - 'app/controllers/user_preferences_controller.rb'
     - 'app/helpers/application_helper.rb'
     - 'app/helpers/browse_helper.rb'
     - 'app/models/client_application.rb'
@@ -67,7 +67,7 @@ Metrics/AbcSize:
 # Offense count: 41
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/BlockLength:
-  Max: 250
+  Max: 257
 
 # Offense count: 12
 # Configuration parameters: CountBlocks.