Skip to content
Snippets Groups Projects
Unverified Commit 2426577a authored by helloworldstack's avatar helloworldstack Committed by GitHub
Browse files

Fix sign in token and warning emails failed to send in some cases (#17589)

parent f9e7f2e4
No related branches found
No related tags found
No related merge requests found
......@@ -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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment