From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Sat, 9 Sep 2017 19:31:48 +0000 (+0900)
Subject: Set fallback address when empty notification address (#4868)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=3f333a8d313add2bf4eb8b5cdb2cd9eacc71b50c;p=mastodon.git

Set fallback address when empty notification address (#4868)
---

diff --git a/config/environments/production.rb b/config/environments/production.rb
index f1351e378..397ea48da 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'],