tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
helloworldstack 2022-02-19 02:43:42 +07:00 committed by GitHub
parent f9e7f2e409
commit 2426577a91
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/mailers/user_mailer.rb
View File

@ -169,7 +169,7 @@ class UserMailer < Devise::Mailer
I18n.with_locale(@resource.locale || I18n.default_locale) do I18n.with_locale(@resource.locale || I18n.default_locale) do
mail to: @resource.email, mail to: @resource.email,
subject: I18n.t("user_mailer.warning.subject.#{@warning.action}", acct: "@#{user.account.local_username_and_domain}"), 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
end end
@ -206,7 +206,7 @@ class UserMailer < Devise::Mailer
I18n.with_locale(@resource.locale || I18n.default_locale) do I18n.with_locale(@resource.locale || I18n.default_locale) do
mail to: @resource.email, mail to: @resource.email,
subject: I18n.t('user_mailer.sign_in_token.subject'), subject: I18n.t('user_mailer.sign_in_token.subject'),
reply_to: Setting.site_contact_email reply_to: ENV['SMTP_REPLY_TO']
end end
end end
end end