diff --git a/app/views/projects/pages/_pages_settings.html.haml b/app/views/projects/pages/_pages_settings.html.haml index 1aa8148dfed32d09884535756cee430eff6edc6f..4c18609ad5967c42a057c27cccbe6f720f719515 100644 --- a/app/views/projects/pages/_pages_settings.html.haml +++ b/app/views/projects/pages/_pages_settings.html.haml @@ -24,10 +24,12 @@ .form-group = f.fields_for :project_setting do |settings| = settings.gitlab_ui_checkbox_component :pages_multiple_versions_enabled, - s_('GitLabPages|Use multiple versions'), + s_('GitLabPages|Use multiple deployments'), label_options: { class: 'label-bold' } %p.gl-pl-6 - = s_("GitLabPages|When enabled, you can create multiple versions of your pages site.").html_safe + = safe_format(s_("GitLabPages|When enabled, you can create multiple deployments of your pages site. %{docs_link_start}Learn More.%{link_end}"), + tag_pair(tag.a(href: help_page_path('user/project/pages/index', anchor: 'create-multiple-deployments'), target: '_blank'), + :docs_link_start, :link_end)) .gl-mt-3 = f.submit s_('GitLabPages|Save changes'), pajamas_button: true diff --git a/doc/user/project/pages/index.md b/doc/user/project/pages/index.md index 60a5a9dee63acd8369d11bfb5dda5990883415c2..61024b0df622508231a2510e52a3cf2497d892cb 100644 --- a/doc/user/project/pages/index.md +++ b/doc/user/project/pages/index.md @@ -175,7 +175,7 @@ To enable multiple GitLab Pages deployments: 1. On the left sidebar, select **Search or go to** and find your project. 1. Select **Deploy > Pages**. -1. Select **Use multiple versions**. +1. Select **Use multiple deployments**. ### Path clash diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 8cf0c45c7a7e9b4ac4457dc8b063a90a3cc88d8a..43cdaeeb1ed6e7ea8e0c2196aae6faeadb354857 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -22180,7 +22180,7 @@ msgstr "" msgid "GitLabPages|Updating your Pages configuration..." msgstr "" -msgid "GitLabPages|Use multiple versions" +msgid "GitLabPages|Use multiple deployments" msgstr "" msgid "GitLabPages|Use unique domain" @@ -22198,7 +22198,7 @@ msgstr "" msgid "GitLabPages|When enabled, all attempts to visit your website through HTTP are automatically redirected to HTTPS using a response with status code 301. Requires a valid certificate for all domains. %{docs_link_start}Learn more.%{link_end}" msgstr "" -msgid "GitLabPages|When enabled, you can create multiple versions of your pages site." +msgid "GitLabPages|When enabled, you can create multiple deployments of your pages site. %{docs_link_start}Learn More.%{link_end}" msgstr "" msgid "GitLabPages|When using Pages under the general domain of a GitLab instance (%{pages_host}), you cannot use HTTPS with subdomains of subdomains. If your namespace or groupname contains a dot, it does not work. This is a limitation of the HTTP Over TLS protocol. HTTP pages work if you don't redirect HTTP to HTTPS. %{docs_link_start}Learn more.%{link_end}" diff --git a/spec/views/projects/pages/_pages_settings.html.haml_spec.rb b/spec/views/projects/pages/_pages_settings.html.haml_spec.rb index e790305da5d10cd9e238d7db9dfe9348e4b3dc45..ba276bc6070192b076eafa52ece49eaf72e764cd 100644 --- a/spec/views/projects/pages/_pages_settings.html.haml_spec.rb +++ b/spec/views/projects/pages/_pages_settings.html.haml_spec.rb @@ -42,7 +42,7 @@ render - expect(rendered).to have_content('Use multiple versions') + expect(rendered).to have_content('Use multiple deployments') end end end