From c6c5dd8848b78528d7ad7f044a0c95be629d372e Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 8 Feb 2023 15:08:59 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/views/notify/user_deactivated_email.html.haml | 2 ++ app/views/notify/user_deactivated_email.text.erb | 1 + 2 files changed, 3 insertions(+) (limited to 'app/views/notify') diff --git a/app/views/notify/user_deactivated_email.html.haml b/app/views/notify/user_deactivated_email.html.haml index a9262cab219..d8ba2639fe6 100644 --- a/app/views/notify/user_deactivated_email.html.haml +++ b/app/views/notify/user_deactivated_email.html.haml @@ -15,3 +15,5 @@ %p = _('Please contact your GitLab administrator if you think this is an error.') + += render 'layouts/mailer/user_deactivated_additional_text' diff --git a/app/views/notify/user_deactivated_email.text.erb b/app/views/notify/user_deactivated_email.text.erb index 9e7d00f4ad1..6faeb5ba0f4 100644 --- a/app/views/notify/user_deactivated_email.text.erb +++ b/app/views/notify/user_deactivated_email.text.erb @@ -8,3 +8,4 @@ <%= _('To reactivate your account, sign in to GitLab at %{gitlab_url}.') % { gitlab_url: root_url } %> <%= _('Please contact your GitLab administrator if you think this is an error.') %> +<%= render 'layouts/mailer/user_deactivated_additional_text' %> -- cgit v1.2.3