X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/a83030dab7512c4b2848e777f7a7dbff456774b3..713de1fadbfa155d477df6c9fb2977fb8689d3c2:/config/application.rb

diff --git a/config/application.rb b/config/application.rb
index 9ba122daf..3220ab591 100644
--- 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