Commit 32ae1801 authored by Nathan Friend's avatar Nathan Friend

Merge branch 'vshushlin-remove-pages-30-min' into 'master'

Remove 30 minutes warning from GitLab Pages

See merge request gitlab-org/gitlab!61984
parents 9e270bce 04590ac1
......@@ -19,5 +19,3 @@
- link_start = '<a href="%{url}" target="_blank" class="gl-alert-link" rel="noopener noreferrer">'.html_safe % { url: help_page }
- link_end = '</a>'.html_safe
= html_escape_once(s_('GitLabPages|Access Control is enabled for this Pages website; only authorized users will be able to access it. To make your website publicly available, navigate to your project\'s %{strong_start}Settings &gt; General &gt; Visibility%{strong_end} and select %{strong_start}Everyone%{strong_end} in pages section. Read the %{link_start}documentation%{link_end} for more information.')).html_safe % { link_start: link_start, link_end: link_end, strong_start: '<strong>'.html_safe, strong_end: '</strong>'.html_safe }
.card-footer.gl-alert-info
= s_('GitLabPages|It may take up to 30 minutes before the site is available after the first deployment.')
......@@ -26,7 +26,6 @@ configured to generate a Pages site.
and click **Run pipeline** to trigger GitLab CI/CD to build and deploy your
site.
The site can take approximately 30 minutes to deploy.
When the pipeline is finished, go to **Settings > Pages** to find the link to
your Pages website.
......
......@@ -15233,9 +15233,6 @@ msgstr ""
msgid "GitLabPages|GitLab Pages are disabled for this project. You can enable them on your project's %{strong_start}Settings &gt; General &gt; Visibility%{strong_end} page."
msgstr ""
msgid "GitLabPages|It may take up to 30 minutes before the site is available after the first deployment."
msgstr ""
msgid "GitLabPages|Maximum size of pages (MB)"
msgstr ""
......
......@@ -39,12 +39,6 @@ RSpec.describe 'Pages edits pages settings', :js do
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
shared_examples 'does not render access control warning' do
it 'does not render access control warning' do
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