astrid
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Supply @instance variable in password reset instructions / password change mailer (#5215)

pull/5145/merge
Ryo Kajiwara 2017-10-04 20:25:24 +09:00 committed by Eugen Rochko
parent 178f718a9b
commit d5091387c6
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/mailers/user_mailer.rb
View File

@ -18,6 +18,7 @@ class UserMailer < Devise::Mailer
def reset_password_instructions(user, token, _opts = {})
@resource = user
@token = token
@instance = Rails.configuration.x.local_domain
I18n.with_locale(@resource.locale || I18n.default_locale) do
mail to: @resource.email, subject: I18n.t('devise.mailer.reset_password_instructions.subject')
@ -26,6 +27,7 @@ class UserMailer < Devise::Mailer
def password_change(user, _opts = {})
@resource = user
@instance = Rails.configuration.x.local_domain
I18n.with_locale(@resource.locale || I18n.default_locale) do
mail to: @resource.email, subject: I18n.t('devise.mailer.password_change.subject')