diff options
| author | Vladimir Shushlin <v.shushlin@gmail.com> | 2019-08-13 20:14:13 +0300 |
|---|---|---|
| committer | Vladimir Shushlin <v.shushlin@gmail.com> | 2019-08-19 13:44:12 +0300 |
| commit | bab522d48c76ab3ede544f4d628b42bb296bc06d (patch) | |
| tree | f9abac53d0510ee2500eab5acfc42c7b46233976 /app | |
| parent | 224db2f8901964a34851018dd93b962a45a3032f (diff) | |
| download | gitlab-ce-bab522d48c76ab3ede544f4d628b42bb296bc06d.tar.gz | |
Add warning when LE certificate can't be obtained64630-add-warning-to-pages-domains-that-obtaining-deploying-ssl-certificates-through-let-s-encrypt-can-take-some-time
* Refactor some tests as well
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/projects/pages_domains/_certificate.html.haml | 18 | ||||
| -rw-r--r-- | app/views/projects/pages_domains/show.html.haml | 7 |
2 files changed, 19 insertions, 6 deletions
diff --git a/app/views/projects/pages_domains/_certificate.html.haml b/app/views/projects/pages_domains/_certificate.html.haml new file mode 100644 index 00000000000..42631fca5e8 --- /dev/null +++ b/app/views/projects/pages_domains/_certificate.html.haml @@ -0,0 +1,18 @@ +- if @domain.auto_ssl_enabled? + - if @domain.enabled? + - if @domain.certificate_text + %pre + = @domain.certificate_text + - else + .bs-callout.bs-callout-info + = _("GitLab is obtaining a Let's Encrypt SSL certificate for this domain. This process can take some time. Please try again later.") + - else + .bs-callout.bs-callout-warning + = _("A Let's Encrypt SSL certificate can not be obtained until your domain is verified.") +- else + - if @domain.certificate_text + %pre + = @domain.certificate_text + - else + .light + = _("missing") diff --git a/app/views/projects/pages_domains/show.html.haml b/app/views/projects/pages_domains/show.html.haml index e9019175219..d0b54946f7e 100644 --- a/app/views/projects/pages_domains/show.html.haml +++ b/app/views/projects/pages_domains/show.html.haml @@ -60,9 +60,4 @@ %td = _("Certificate") %td - - if @domain.certificate_text - %pre - = @domain.certificate_text - - else - .light - = _("missing") + = render 'certificate' |