diff options
| author | David Yip <yipdw@member.fsf.org> | 2017-09-10 13:04:27 -0500 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2017-09-10 13:04:27 -0500 |
| commit | 932571fa22273e6ff5c229147668c426b4d65326 (patch) | |
| tree | 973b16e23a7cbeaf5a43550444e54aa1ace50a46 /config/environments | |
| parent | c9df53044a333276853f7dc7ef2aed6d48df087f (diff) | |
| parent | ab71cf4593ed3259168c641d5f4f5a0ebbe4d045 (diff) | |
Merge tag 'v1.6.0' into sync/upstream
Diffstat (limited to 'config/environments')
| -rw-r--r-- | config/environments/production.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/environments/production.rb b/config/environments/production.rb index 928fd13e5..dc1ce5ed6 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -73,7 +73,7 @@ Rails.application.configure do config.action_mailer.perform_caching = false # E-mails - config.action_mailer.default_options = { from: ENV.fetch('SMTP_FROM_ADDRESS') } + config.action_mailer.default_options = { from: ENV.fetch('SMTP_FROM_ADDRESS', 'notifications@localhost') } config.action_mailer.smtp_settings = { :port => ENV['SMTP_PORT'], |