Commit d8d13020 authored by Phil Hughes's avatar Phil Hughes

Merge branch '10446-resolve-ee-diff-repository-check-mailer-notify' into 'master'

Resolve CE/EE in repo check mailer notify html

Closes #10446

See merge request gitlab-org/gitlab-ee!13972
parents 7e7454ae 28ac9856
......@@ -7,11 +7,4 @@
%p
= _("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?
%p
—
%br
%br
= 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?
%p
= raw "—"
%br
%br
= 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