Commit 16f97798 authored by Phil Hughes's avatar Phil Hughes

Merge branch '6361-move-ee-notify-text-haml' into 'master'

Fixes EE differences for app/views/repository_check_mailer/notify.text.haml

Closes #6361

See merge request gitlab-org/gitlab-ee!12149
parents 06383db8 c49371da
......@@ -4,9 +4,4 @@
= _("You are receiving this message because you are a GitLab administrator for %{url}.") % { url: Gitlab.config.gitlab.url }
-# EE-specific start
- if Gitlab::CurrentSettings.email_additional_text.present?
\
= '---'
= Gitlab::Utils.nlbr(Gitlab::CurrentSettings.email_additional_text)
-# EE-specific end
= render_if_exists 'repository_check_mailer/email_additional_text'
- if Gitlab::CurrentSettings.email_additional_text.present?
\
= '---'
= Gitlab::Utils.nlbr(Gitlab::CurrentSettings.email_additional_text)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment