diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-08 18:08:59 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-08 18:08:59 +0300 |
| commit | c6c5dd8848b78528d7ad7f044a0c95be629d372e (patch) | |
| tree | 261577e229ade85472353eb5b380c1e4fed9bc60 /app/views | |
| parent | d0aeb5df3d6b06165355b023a25b79c7bd74a27d (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views')
4 files changed, 9 insertions, 0 deletions
diff --git a/app/views/layouts/mailer/_user_deactivated_additional_text.html.haml b/app/views/layouts/mailer/_user_deactivated_additional_text.html.haml new file mode 100644 index 00000000000..cabdd4b09ec --- /dev/null +++ b/app/views/layouts/mailer/_user_deactivated_additional_text.html.haml @@ -0,0 +1,3 @@ +- return unless Feature.enabled?(:deactivation_email_additional_text) && Gitlab::CurrentSettings.deactivation_email_additional_text.present? +%p + = Gitlab::Utils.nlbr(Gitlab::CurrentSettings.deactivation_email_additional_text) diff --git a/app/views/layouts/mailer/_user_deactivated_additional_text.text.erb b/app/views/layouts/mailer/_user_deactivated_additional_text.text.erb new file mode 100644 index 00000000000..5862c8059f9 --- /dev/null +++ b/app/views/layouts/mailer/_user_deactivated_additional_text.text.erb @@ -0,0 +1,3 @@ +<% return unless Feature.enabled?(:deactivation_email_additional_text) && Gitlab::CurrentSettings.deactivation_email_additional_text.present? %> + +<%= Gitlab::CurrentSettings.deactivation_email_additional_text %> 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' %> |