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

openstreetmap · Oct 31, 2018 · 5b062f0 · 5b062f0
2 parents 82f3dc6 + 4395b79
commit 5b062f0
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git 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 → app/mailers/notifier.rb b/app/models/notifier.rb → app/mailers/notifier.rb