diff options
author | Phil Hughes <me@iamphill.com> | 2019-06-05 15:43:38 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2019-06-05 15:43:38 +0000 |
commit | 86ff32da666c8d284ecff5987d42fa4dfed2ee9b (patch) | |
tree | 1960bce32a34073ae59c0ae4e20292a2177dc47e /app | |
parent | 92b06c13bd12abf85f6beb18b3b5c2f0e38c2760 (diff) | |
parent | 85fa6c436b700a486cfccfc0b81cfd025054c74b (diff) | |
download | gitlab-ce-86ff32da666c8d284ecff5987d42fa4dfed2ee9b.tar.gz |
Merge branch 'ce-10446-resolve-ee-diff-repository-check-mailer-notify' into 'master'
[CE] Resolve CE/EE in repo check mailer notify html
See merge request gitlab-org/gitlab-ce!29195
Diffstat (limited to 'app')
-rw-r--r-- | app/views/repository_check_mailer/notify.html.haml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/views/repository_check_mailer/notify.html.haml b/app/views/repository_check_mailer/notify.html.haml index d5327a2b4cc..dfcd1c6b19f 100644 --- a/app/views/repository_check_mailer/notify.html.haml +++ b/app/views/repository_check_mailer/notify.html.haml @@ -6,3 +6,5 @@ %p = _("You are receiving this message because you are a GitLab administrator for %{url}.") % { url: Gitlab.config.gitlab.url } + += render_if_exists 'repository_check_mailer/email_additional_text' |