From d5091387c6ddbe03b118b0cfb6d74cf821b84fb2 Mon Sep 17 00:00:00 2001
From: Ryo Kajiwara <kfe-fecn6.prussian@s01.info>
Date: Wed, 4 Oct 2017 20:25:24 +0900
Subject: Supply @instance variable in password reset instructions / password
 change mailer (#5215)

---
 app/mailers/user_mailer.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb
index 1517c027e..c475a9911 100644
--- 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')
-- 
cgit