diff options
| author | Nathan Friend <nathan@gitlab.com> | 2019-08-23 16:08:23 -0300 |
|---|---|---|
| committer | Nathan Friend <nathan@gitlab.com> | 2019-08-30 11:15:40 -0300 |
| commit | 9d0a7fa6f95718c5685b421193b35a546d47bce5 (patch) | |
| tree | 542ad64286a5591c48986e5ae47d209cad20fae8 | |
| parent | 79011fab0852de16e6b850ced4f282c97f4e8301 (diff) | |
| download | gitlab-ce-65304-add-pages-first-deployment-message.tar.gz | |
Add warning about Pages initial deployment delay65304-add-pages-first-deployment-message
This commit adds a warning message that is always displayed that informs
users that their GitLab Pages sites will take a bit of time before they
can be accessed after being deployed for the first time.
| -rw-r--r-- | app/views/projects/pages/_access.html.haml | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/65304-add-pages-first-deployment-message.yml | 5 | ||||
| -rw-r--r-- | locale/gitlab.pot | 6 | ||||
| -rw-r--r-- | spec/features/projects/pages_spec.rb | 6 |
4 files changed, 20 insertions, 1 deletions
diff --git a/app/views/projects/pages/_access.html.haml b/app/views/projects/pages/_access.html.haml index 73ea30e1d3d..539f223ca9b 100644 --- a/app/views/projects/pages/_access.html.haml +++ b/app/views/projects/pages/_access.html.haml @@ -5,9 +5,11 @@ .card-body %p %strong - Congratulations! Your pages are served under: + = _("Your pages are served under:") %p= link_to @project.pages_url, @project.pages_url - @project.pages_domains.each do |domain| %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.") diff --git a/changelogs/unreleased/65304-add-pages-first-deployment-message.yml b/changelogs/unreleased/65304-add-pages-first-deployment-message.yml new file mode 100644 index 00000000000..d4c3533acaf --- /dev/null +++ b/changelogs/unreleased/65304-add-pages-first-deployment-message.yml @@ -0,0 +1,5 @@ +--- +title: Add warning about initial deployment delay for GitLab Pages sites +merge_request: 32122 +author: +type: added diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 401b46b78f1..bfba91e71eb 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -6257,6 +6257,9 @@ msgstr "" msgid "Issues, merge requests, pushes, and comments." 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." msgstr "" @@ -13608,6 +13611,9 @@ msgstr "" msgid "Your new personal access token has been created." msgstr "" +msgid "Your pages are served under:" +msgstr "" + msgid "Your password reset token has expired." msgstr "" diff --git a/spec/features/projects/pages_spec.rb b/spec/features/projects/pages_spec.rb index c4b3ddb2088..d55e9d12801 100644 --- a/spec/features/projects/pages_spec.rb +++ b/spec/features/projects/pages_spec.rb @@ -30,6 +30,12 @@ shared_examples 'pages settings editing' do expect(page).to have_content('Access pages') 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 it 'renders message that support is disabled' do visit project_pages_path(project) |