diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-30 09:09:18 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-30 09:09:18 +0300 |
| commit | f38060aeee94f359484c17797881aca4f5f826a9 (patch) | |
| tree | 4e4ed5bfccf7b7f33c8c4ae70f7afbd124256a89 /app/views/layouts | |
| parent | cef84e8da0fb449df51cec1e76f7c0371be83906 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/layouts')
| -rw-r--r-- | app/views/layouts/mailer/_user_deactivated_additional_text.html.haml | 2 | ||||
| -rw-r--r-- | app/views/layouts/mailer/_user_deactivated_additional_text.text.erb | 2 |
2 files changed, 2 insertions, 2 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 index cabdd4b09ec..5104d4f6e11 100644 --- a/app/views/layouts/mailer/_user_deactivated_additional_text.html.haml +++ b/app/views/layouts/mailer/_user_deactivated_additional_text.html.haml @@ -1,3 +1,3 @@ -- return unless Feature.enabled?(:deactivation_email_additional_text) && Gitlab::CurrentSettings.deactivation_email_additional_text.present? +- return unless 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 index 5862c8059f9..0de59fe7a75 100644 --- a/app/views/layouts/mailer/_user_deactivated_additional_text.text.erb +++ b/app/views/layouts/mailer/_user_deactivated_additional_text.text.erb @@ -1,3 +1,3 @@ -<% return unless Feature.enabled?(:deactivation_email_additional_text) && Gitlab::CurrentSettings.deactivation_email_additional_text.present? %> +<% return unless Gitlab::CurrentSettings.deactivation_email_additional_text.present? %> <%= Gitlab::CurrentSettings.deactivation_email_additional_text %> |