diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-14 18:09:44 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-14 18:09:44 +0300 |
commit | 874ead9c3a50de4c4ca4551eaf5b7eb976d26b50 (patch) | |
tree | 637ee9f2da5e251bc08ebf3e972209d51966bf7c /app/views/notify | |
parent | 2e4c4055181eec9186458dd5dd3219c937032ec7 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/notify')
-rw-r--r-- | app/views/notify/pages_domain_auto_ssl_failed_email.html.haml | 11 | ||||
-rw-r--r-- | app/views/notify/pages_domain_auto_ssl_failed_email.text.haml | 7 |
2 files changed, 18 insertions, 0 deletions
diff --git a/app/views/notify/pages_domain_auto_ssl_failed_email.html.haml b/app/views/notify/pages_domain_auto_ssl_failed_email.html.haml new file mode 100644 index 00000000000..1bc2cc15616 --- /dev/null +++ b/app/views/notify/pages_domain_auto_ssl_failed_email.html.haml @@ -0,0 +1,11 @@ +%p + = _("Something went wrong while obtaining the Let's Encrypt certificate.") +%p + #{_('Project')}: #{link_to @project.human_name, project_url(@project)} +%p + #{_('Domain')}: #{link_to @domain.domain, project_pages_domain_url(@project, @domain)} +%p + - docs_url = help_page_url('user/project/pages/custom_domains_ssl_tls_certification/lets_encrypt_integration.md', anchor: 'troubleshooting') + - link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: docs_url } + - link_end = '</a>'.html_safe + = _("Please follow the %{link_start}Let\'s Encrypt troubleshooting instructions%{link_end} to re-obtain your Let's Encrypt certificate.").html_safe % { link_start: link_start, link_end: link_end } diff --git a/app/views/notify/pages_domain_auto_ssl_failed_email.text.haml b/app/views/notify/pages_domain_auto_ssl_failed_email.text.haml new file mode 100644 index 00000000000..6f20d11c966 --- /dev/null +++ b/app/views/notify/pages_domain_auto_ssl_failed_email.text.haml @@ -0,0 +1,7 @@ += _("Something went wrong while obtaining the Let's Encrypt certificate.").html_safe + +#{_('Project')}: #{project_url(@project)} +#{_('Domain')}: #{project_pages_domain_url(@project, @domain)} + +- docs_url = help_page_url('user/project/pages/custom_domains_ssl_tls_certification/lets_encrypt_integration.md', anchor: 'troubleshooting') += _("Please follow the Let\'s Encrypt troubleshooting instructions to re-obtain your Let's Encrypt certificate: %{docs_url}.").html_safe % { docs_url: docs_url } |