Permalink
Browse files

Moved default_url_options/host setting, cause it doesn't have anythin…

…g to do with mail server settings
  • Loading branch information...
1 parent d078aed commit 7be2abb0829d5335274a7263ddf850129f10f249 @mischa78 mischa78 committed Jun 20, 2011
Showing with 6 additions and 2 deletions.
  1. +3 −1 config/environments/development.rb
  2. +3 −1 config/environments/production.rb
@@ -24,7 +24,6 @@
config.action_dispatch.best_standards_support = :builtin
# Mail settings
- # config.action_mailer.default_url_options = { :host => 'localhost:3000' }
# config.action_mailer.delivery_method = :smtp
# config.action_mailer.smtp_settings = {
# :address => 'mailhost',
@@ -34,6 +33,9 @@
# :authentication => 'plain'
# }
+ # Host
+ # config.action_mailer.default_url_options = { :host => 'localhost:3000' }
+
# From address
# ActionMailer::Base.default :from => 'Boxroom <yourname@yourdomain.com>'
end
@@ -48,7 +48,6 @@
config.active_support.deprecation = :notify
# Mail settings
- # config.action_mailer.default_url_options = { :host => 'localhost:3000' }
# config.action_mailer.delivery_method = :smtp
# config.action_mailer.smtp_settings = {
# :address => 'mailhost',
@@ -58,6 +57,9 @@
# :authentication => 'plain'
# }
+ # Host
+ # config.action_mailer.default_url_options = { :host => 'localhost:3000' }
+
# From address
# ActionMailer::Base.default :from => 'Boxroom <yourname@yourdomain.com>'
end

0 comments on commit 7be2abb

Please sign in to comment.