added FriendlyEmailFooter site setting (dehardcoding Codidactyl)

Oaphi · Oaphi · commit 4772df0025f3 · 2026-01-24T05:59:03.000+03:00
diff --git a/app/views/devise/mailer/_friendly_footer.html.erb b/app/views/devise/mailer/_friendly_footer.html.erb
diff --git a/app/views/devise/mailer/confirmation_instructions.html.erb b/app/views/devise/mailer/confirmation_instructions.html.erb
@@ -14,4 +14,4 @@
   <%= confirmation_url(@resource, confirmation_token: @token, host: RequestContext.community.host) %>
 </p>
 
-<%= render 'devise/mailer/friendly_footer' %>
+<%= sanitize(render_markdown(SiteSetting['FriendlyEmailFooter']), scrubber: scrubber) %>
diff --git a/app/views/devise/mailer/email_changed.html.erb b/app/views/devise/mailer/email_changed.html.erb
@@ -19,4 +19,4 @@
   </p>
 <% end %><br/>
 
-<%= render 'devise/mailer/friendly_footer' %>
+<%= sanitize(render_markdown(SiteSetting['FriendlyEmailFooter']), scrubber: scrubber) %>
diff --git a/app/views/devise/mailer/password_change.html.erb b/app/views/devise/mailer/password_change.html.erb
@@ -8,4 +8,4 @@
   <%= link_to 'change your password now', new_password_url(@resource) %> to protect your account.
 </p>
 
-<%= render 'devise/mailer/friendly_footer' %>
+<%= sanitize(render_markdown(SiteSetting['FriendlyEmailFooter']), scrubber: scrubber) %>
diff --git a/app/views/devise/mailer/reset_password_instructions.html.erb b/app/views/devise/mailer/reset_password_instructions.html.erb
@@ -11,4 +11,4 @@
   above and set a new password.
 </p>
 
-<%= render 'devise/mailer/friendly_footer' %>
+<%= sanitize(render_markdown(SiteSetting['FriendlyEmailFooter']), scrubber: scrubber) %>
diff --git a/app/views/devise/mailer/unlock_instructions.html.erb b/app/views/devise/mailer/unlock_instructions.html.erb
@@ -6,4 +6,4 @@
 
 <p><%= link_to 'Unlock my account', unlock_url(@resource, unlock_token: @token), class: 'button is-filled' %></p>
 
-<%= render 'devise/mailer/friendly_footer' %>
+<%= sanitize(render_markdown(SiteSetting['FriendlyEmailFooter']), scrubber: scrubber) %>
diff --git a/db/seeds/site_settings.yml b/db/seeds/site_settings.yml
@@ -233,6 +233,17 @@
     The address to send moderator distribution list emails from (can be a fake address).
     Make sure your server is allowed to send email from this address, or your mails will not be received.
 
+- name: FriendlyEmailFooter
+  value: >
+    <hr/>
+    <p><em>Thanks!</em></p>
+    <p><em>Your Friendly Neighbourhood Codidactyl</em></p>
+  value_type: text
+  category: Email
+  community_id: ~
+  description: >
+    Friendly footer to add to emails such as new user confirmation instructions. Markdown allowed.
+
 - name: NoReplySenderName
   value: Codidact
   value_type: string

Original file line number	Diff line number	Diff line change
`@@ -6,4 +6,4 @@`
`6`	`6`
`7`	`7`	`<p><%= link_to 'Unlock my account', unlock_url(@resource, unlock_token: @token), class: 'button is-filled' %></p>`
`8`	`8`
`9`		`-<%= render 'devise/mailer/friendly_footer' %>`
	`9`	`+<%= sanitize(render_markdown(SiteSetting['FriendlyEmailFooter']), scrubber: scrubber) %>`