diff options
| author | Xinhui | 2017-07-07 12:22:40 +0200 |
|---|---|---|
| committer | Xinhui | 2017-07-07 12:43:24 +0200 |
| commit | 8d8c76aca3ab4a4cda2de7d9d2d80dc98949ed0e (patch) | |
| tree | a4a351158609ad3d5ea52c8298263cf3407e888f /config/environments | |
| parent | dbf45754da3c16043f30cf14faa2c654f6e889c2 (diff) | |
| download | chouette-core-8d8c76aca3ab4a4cda2de7d9d2d80dc98949ed0e.tar.bz2 | |
Set default action_mailer default_options from
Diffstat (limited to 'config/environments')
| -rw-r--r-- | config/environments/development.rb | 3 | ||||
| -rw-r--r-- | config/environments/test.rb | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/config/environments/development.rb b/config/environments/development.rb index 0b4eab7d2..f59a34a23 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -37,8 +37,9 @@ Rails.application.configure do #config.active_record.auto_explain_threshold_in_seconds = (RUBY_PLATFORM == "java" ? nil : 0.5) config.action_mailer.default_url_options = { :host => 'localhost:3000' } + config.action_mailer.default_options = { from: 'Stif BOIV <stif-boiv@af83.com>' } + config.action_mailer.delivery_method = :letter_opener - config.action_mailer.delivery_method = :letter_opener # change to true to allow email to be sent during development config.action_mailer.perform_deliveries = true config.action_mailer.raise_delivery_errors = true diff --git a/config/environments/test.rb b/config/environments/test.rb index 80ed940ca..a6db12006 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -30,6 +30,7 @@ Rails.application.configure do # The :test delivery method accumulates sent emails in the # ActionMailer::Base.deliveries array. config.action_mailer.delivery_method = :test + config.action_mailer.default_options = { from: 'Stif BOIV <stif-boiv@af83.com>' } # Print deprecation notices to the stderr. config.active_support.deprecation = :stderr @@ -71,8 +72,6 @@ Rails.application.configure do # Configure the e-mail address which will be shown in Devise::Maile config.mailer_sender = "appli@chouette.mobi" - - config.action_mailer.delivery_method = :sendmail # change to true to allow email to be sent during development config.action_mailer.perform_deliveries = false config.action_mailer.raise_delivery_errors = false |