diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-19 15:57:54 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-19 15:57:54 +0300 |
| commit | 419c53ec62de6e97a517abd5fdd4cbde3a942a34 (patch) | |
| tree | 1f43a548b46bca8a5fb8fe0c31cef1883d49c5b6 /app/views/layouts/mailer/_user_deactivated_additional_text.html.haml | |
| parent | 1da20d9135b3ad9e75e65b028bffc921aaf8deb7 (diff) | |
Add latest changes from gitlab-org/gitlab@16-5-stable-eev16.5.0-rc42
Diffstat (limited to 'app/views/layouts/mailer/_user_deactivated_additional_text.html.haml')
| -rw-r--r-- | app/views/layouts/mailer/_user_deactivated_additional_text.html.haml | 2 |
1 files changed, 1 insertions, 1 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) |