Set default_url_options for action_mailer

[rails.git] / config / application.rb

diff --git a/config/application.rb b/config/application.rb
index 9ba122dafb8b1518af4930f92ceec945befff7ec..3220ab5916fea0717ca2316debb051d9496ef590 100644 (file)
--- a/config/application.rb
+++ b/config/application.rb
@@ -44,7 +44,7 @@ module OpenStreetMap
       config.logstasher.log_controller_parameters = true
     end
 
-    # Configure image optimisation
-    config.assets.image_optim = YAML.load_file(Rails.root.join("config", "image_optim.yml"))
+    # Set the host and protocol for all action mailer urls
+    config.action_mailer.default_url_options = { :host => SERVER_URL, :protocol => SERVER_PROTOCOL }
   end
 end