logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: 3f333a8d313add2bf4eb8b5cdb2cd9eacc71b50c
parent: bc077018b8b9212aa903af035bfc8bcf529e8c68
Author: Yamagishi Kazutoshi <ykzts@desire.sh>
Date:   Sun, 10 Sep 2017 04:31:48 +0900

Set fallback address when empty notification address (#4868)


Diffstat:

Mconfig/environments/production.rb2+-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 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'],