about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorhelloworldstack <66512512+helloworldstack@users.noreply.github.com>2022-02-19 02:43:42 +0700
committerGitHub <noreply@github.com>2022-02-18 20:43:42 +0100
commit2426577a914af7e0de906620b1f9fda3af48bc8a (patch)
tree0108e82932e717966dd45b3647147d7946199bbd /app
parentf9e7f2e4091cdeebfbdea47a49f020504dba038c (diff)
Fix sign in token and warning emails failed to send in some cases (#17589)
Diffstat (limited to 'app')
-rw-r--r--app/mailers/user_mailer.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb
index 583c948b0..1a823328c 100644
--- a/app/mailers/user_mailer.rb
+++ b/app/mailers/user_mailer.rb
@@ -169,7 +169,7 @@ class UserMailer < Devise::Mailer
     I18n.with_locale(@resource.locale || I18n.default_locale) do
       mail to: @resource.email,
            subject: I18n.t("user_mailer.warning.subject.#{@warning.action}", acct: "@#{user.account.local_username_and_domain}"),
-           reply_to: Setting.site_contact_email
+           reply_to: ENV['SMTP_REPLY_TO']
     end
   end
 
@@ -206,7 +206,7 @@ class UserMailer < Devise::Mailer
     I18n.with_locale(@resource.locale || I18n.default_locale) do
       mail to: @resource.email,
            subject: I18n.t('user_mailer.sign_in_token.subject'),
-           reply_to: Setting.site_contact_email
+           reply_to: ENV['SMTP_REPLY_TO']
     end
   end
 end