Merge branch 'master' into terms

[rails.git] / app / models / notifier.rb

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index df30d651bd75ce4d678ee12ec799587f202b8cb8..41734bb5b21e1954d35d6052b41905df225c0768 100644 (file)
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -99,8 +99,8 @@ private
   def common_headers(recipient)
     recipients recipient.email
     locale recipient.preferred_language_from(I18n.available_locales)
-    from "OpenStreetMap <webmaster@openstreetmap.org>"
-    headers "return-path" => "bounces@openstreetmap.org",
+    from EMAIL_FROM
+    headers "return-path" => EMAIL_RETURN_PATH,
             "Auto-Submitted" => "auto-generated"
   end