Commit 86cdf212 authored by Filipa Lacerda's avatar Filipa Lacerda

Merge branch '65304-add-pages-first-deployment-message' into 'master'

Resolve "Improve pages load wait time experience"

Closes #65304

See merge request gitlab-org/gitlab-ce!32122
parents 84edac2a 9d0a7fa6
...@@ -5,9 +5,11 @@ ...@@ -5,9 +5,11 @@
.card-body .card-body
%p %p
%strong %strong
Congratulations! Your pages are served under: = _("Your pages are served under:")
%p= link_to @project.pages_url, @project.pages_url %p= link_to @project.pages_url, @project.pages_url
- @project.pages_domains.each do |domain| - @project.pages_domains.each do |domain|
%p= link_to domain.url, domain.url %p= link_to domain.url, domain.url
.card-footer.alert-primary
= _("It may take up to 30 minutes before the site is available after the first deployment.")
---
title: Add warning about initial deployment delay for GitLab Pages sites
merge_request: 32122
author:
type: added
...@@ -6257,6 +6257,9 @@ msgstr "" ...@@ -6257,6 +6257,9 @@ msgstr ""
msgid "Issues, merge requests, pushes, and comments." msgid "Issues, merge requests, pushes, and comments."
msgstr "" msgstr ""
msgid "It may take up to 30 minutes before the site is available after the first deployment."
msgstr ""
msgid "It must have a header row and at least two columns: the first column is the issue title and the second column is the issue description. The separator is automatically detected." msgid "It must have a header row and at least two columns: the first column is the issue title and the second column is the issue description. The separator is automatically detected."
msgstr "" msgstr ""
...@@ -13614,6 +13617,9 @@ msgstr "" ...@@ -13614,6 +13617,9 @@ msgstr ""
msgid "Your new personal access token has been created." msgid "Your new personal access token has been created."
msgstr "" msgstr ""
msgid "Your pages are served under:"
msgstr ""
msgid "Your password reset token has expired." msgid "Your password reset token has expired."
msgstr "" msgstr ""
......
...@@ -30,6 +30,12 @@ shared_examples 'pages settings editing' do ...@@ -30,6 +30,12 @@ shared_examples 'pages settings editing' do
expect(page).to have_content('Access pages') expect(page).to have_content('Access pages')
end end
it 'renders first deployment warning' do
visit project_pages_path(project)
expect(page).to have_content('It may take up to 30 minutes before the site is available after the first deployment.')
end
context 'when support for external domains is disabled' do context 'when support for external domains is disabled' do
it 'renders message that support is disabled' do it 'renders message that support is disabled' do
visit project_pages_path(project) visit project_pages_path(project)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment