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

[rails.git] / .rubocop_todo.yml

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 22890e7c78c44d963bd9d22168e326a1943fa3ce..ea957a8caa294444eaf3c715bde9abe80684f1e2 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -19,7 +19,7 @@ Lint/AssignmentInCondition:
     - 'app/helpers/application_helper.rb'
     - 'app/helpers/browse_helper.rb'
     - 'app/models/client_application.rb'
-    - 'app/models/notifier.rb'
+    - 'app/mailers/notifier.rb'
     - 'lib/nominatim.rb'
     - 'lib/osm.rb'
     - 'script/deliver-message'
@@ -48,7 +48,7 @@ Metrics/BlockNesting:
 # Offense count: 63
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 1801
+  Max: 1627
 
 # Offense count: 72
 Metrics/CyclomaticComplexity: