diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-10 03:07:56 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-10 03:07:56 +0300 |
| commit | 775816e676aae53509d7b6f364945f2720636f72 (patch) | |
| tree | 0baa821597f08edce720b236b0c07a6d13893f85 /app/views/projects | |
| parent | e98d69bc8b8b926a727d36e37d2ee30c9fa28907 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects')
| -rw-r--r-- | app/views/projects/pages/_ssl_limitations_warning.html.haml | 7 | ||||
| -rw-r--r-- | app/views/projects/pages/show.html.haml | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/app/views/projects/pages/_ssl_limitations_warning.html.haml b/app/views/projects/pages/_ssl_limitations_warning.html.haml new file mode 100644 index 00000000000..7188e169824 --- /dev/null +++ b/app/views/projects/pages/_ssl_limitations_warning.html.haml @@ -0,0 +1,7 @@ +.bs-callout.bs-callout-warning + %i.fa.fa-warning + %strong= _("Warning:") + - pages_host = Gitlab.config.pages.host + = s_("GitLabPages|When using Pages under the general domain of a GitLab instance (%{pages_host}), you cannot use HTTPS with sub-subdomains. This means that if your username/groupname contains a dot it will not work. This is a limitation of the HTTP Over TLS protocol. HTTP pages will continue to work provided you don't redirect HTTP to HTTPS.").html_safe % { pages_host: pages_host } + + %strong= external_link(s_("GitLabPages|Learn more."), "https://docs.gitlab.com/ee/user/project/pages/introduction.html#limitations") diff --git a/app/views/projects/pages/show.html.haml b/app/views/projects/pages/show.html.haml index 8dbe67e153a..4b7810ea357 100644 --- a/app/views/projects/pages/show.html.haml +++ b/app/views/projects/pages/show.html.haml @@ -15,6 +15,7 @@ %hr.clearfix + = render 'ssl_limitations_warning' if @project.pages_subdomain.include?(".") = render 'access' = render 'use' - if Gitlab.config.pages.external_http || Gitlab.config.pages.external_https |