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

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 8fc701cb3b7f9797cf67eba47fad086086d4b1a6..26a50cb97c26b1d6f17e4a50162df74e316f2cfb 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'

diff --git a/app/models/notifier.rb b/app/mailers/notifier.rb
similarity index 100%
rename from app/models/notifier.rb
rename to app/mailers/notifier.rb