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

[rails.git] / config / application.rb

diff --git a/config/application.rb b/config/application.rb
index 3220ab5916fea0717ca2316debb051d9496ef590..b6e2ba46788c14d6342e934f31a0364b9e83c43c 100644 (file)
--- a/config/application.rb
+++ b/config/application.rb
@@ -43,8 +43,5 @@ module OpenStreetMap
       config.logstasher.logger_path = LOGSTASH_PATH
       config.logstasher.log_controller_parameters = true
     end
       config.logstasher.logger_path = LOGSTASH_PATH
       config.logstasher.log_controller_parameters = true
     end

-
-    # Set the host and protocol for all action mailer urls
-    config.action_mailer.default_url_options = { :host => SERVER_URL, :protocol => SERVER_PROTOCOL }

   end
 end
   end
 end