From c4feba43476635904a4a0f0dbd9c7b48d4c2985a Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 26 Mar 2024 11:58:48 -0400
Subject: [PATCH] Use existing `MascotHelper#instance_presenter` instead of
local var in `welcome` email template (#29759)
---
app/mailers/user_mailer.rb | 5 +++--
app/views/user_mailer/welcome.html.haml | 2 --
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb
index 96fcd51efa..f8c1c9a8d0 100644
--- a/app/mailers/user_mailer.rb
+++ b/app/mailers/user_mailer.rb
@@ -5,10 +5,11 @@ class UserMailer < Devise::Mailer
helper :accounts
helper :application
- helper :instance
- helper :statuses
+ helper :mascot
helper :formatting
+ helper :instance
helper :routing
+ helper :statuses
before_action :set_instance
diff --git a/app/views/user_mailer/welcome.html.haml b/app/views/user_mailer/welcome.html.haml
index e7f9c47e3b..fd8980c234 100644
--- a/app/views/user_mailer/welcome.html.haml
+++ b/app/views/user_mailer/welcome.html.haml
@@ -1,5 +1,3 @@
-- instance_presenter = InstancePresenter.new
-
= content_for :heading do
.email-desktop-flex
.email-header-left