]> cat aescling's git repositories - mastodon.git/commitdiff
Supply @instance variable in password reset instructions / password change mailer...
authorRyo Kajiwara <kfe-fecn6.prussian@s01.info>
Wed, 4 Oct 2017 11:25:24 +0000 (20:25 +0900)
committerEugen Rochko <eugen@zeonfederated.com>
Wed, 4 Oct 2017 11:25:24 +0000 (13:25 +0200)
app/mailers/user_mailer.rb

index 1517c027e87b8bb1873212e435094444fcb9211f..c475a9911b15ccca29771a73e35f7db93047d1b4 100644 (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')