logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: d5091387c6ddbe03b118b0cfb6d74cf821b84fb2
parent: 178f718a9b1cab57fbd9df511abe56533f12e129
Author: Ryo Kajiwara <kfe-fecn6.prussian@s01.info>
Date:   Wed,  4 Oct 2017 20:25:24 +0900

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


Diffstat:

Mapp/mailers/user_mailer.rb2++
1 file changed, 2 insertions(+), 0 deletions(-)

diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb @@ -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')