diff options
| author | Phil Hughes <me@iamphill.com> | 2019-05-08 09:59:27 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-05-08 09:59:27 +0000 |
| commit | 95b423bcae5f51f19e8cbc8e1aa563ceb44ca5b4 (patch) | |
| tree | 7e8e432c89a9989b7be39299719bd4ed4b08a0fb | |
| parent | 9f888c7440a99f0c9bd59ac066fae88e7c863e41 (diff) | |
| parent | f6fe8910cdf2431f835138f5ac7f235652946b4c (diff) | |
| download | gitlab-ce-95b423bcae5f51f19e8cbc8e1aa563ceb44ca5b4.tar.gz | |
Merge branch '6361-move-ee-notify-text-haml' into 'master'
CE: Fixes EE differences for app/views/repository_check_mailer/notify.text.haml
See merge request gitlab-org/gitlab-ce!28022
| -rw-r--r-- | app/views/repository_check_mailer/notify.text.haml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/views/repository_check_mailer/notify.text.haml b/app/views/repository_check_mailer/notify.text.haml index 6b64b337b0e..a2e04fa710f 100644 --- a/app/views/repository_check_mailer/notify.text.haml +++ b/app/views/repository_check_mailer/notify.text.haml @@ -3,3 +3,5 @@ = _("View details: %{details_url}") % { details_url: admin_projects_url(last_repository_check_failed: 1) } = _("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' |