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

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 c0c2bd3aab7..e91061e74c2 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 ""
 
@@ -13614,6 +13617,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)