diff --git a/app/assets/javascripts/gitlab_pages/components/deployments.vue b/app/assets/javascripts/gitlab_pages/components/deployments.vue index 11a73c57928bc1287da2c9cb91cd4c306443a9f9..ed8a665e898be6a732ea97b3232b2201d50efbb9 100644 --- a/app/assets/javascripts/gitlab_pages/components/deployments.vue +++ b/app/assets/javascripts/gitlab_pages/components/deployments.vue @@ -11,12 +11,12 @@ export default { inject: ['projectFullPath'], i18n: { title: s__('Pages|Deployments'), - environmentDeploymentsTitle: s__('Pages|Environment deployments'), + parallelDeploymentsTitle: s__('Pages|Parallel deployments'), noDeploymentsMessage: s__('Pages|No deployments yet'), loadErrorMessage: s__( 'Pages|Some Pages deployments could not be loaded. Try reloading the page.', ), - showInactiveLabel: s__('Pages|Include stopped deployments'), + showInactiveLabel: s__('Pages|Show stopped deployments'), }, data() { return { @@ -25,7 +25,7 @@ export default { hasError: false, alerts: {}, primaryDeployments: null, - environmentDeployments: null, + parallelDeployments: null, }; }, computed: { @@ -39,22 +39,22 @@ export default { hasMultipleDeployments() { return ( this.primaryDeployments?.nodes.length > 1 || - (this.primaryDeployments?.nodes.length && this.environmentDeployments?.nodes.length > 0) + (this.primaryDeployments?.nodes.length && this.parallelDeployments?.nodes.length > 0) ); }, primaryDeploymentsNotLoaded() { if (!this.primaryDeployments) return undefined; return this.primaryDeployments.count - this.primaryDeployments.nodes.length; }, - environmentDeploymentsNotLoaded() { - if (!this.environmentDeployments) return 0; - return this.environmentDeployments.count - this.environmentDeployments.nodes.length; + parallelDeploymentsNotLoaded() { + if (!this.parallelDeployments) return 0; + return this.parallelDeployments.count - this.parallelDeployments.nodes.length; }, loadedPrimaryDeploymentsCount() { return this.primaryDeployments?.nodes.length || 0; }, - loadedEnvironmentDeploymentsCount() { - return this.environmentDeployments?.nodes.length || 0; + loadedParallelDeploymentsCount() { + return this.parallelDeployments?.nodes.length || 0; }, }, apollo: { @@ -73,7 +73,7 @@ export default { this.hasError = true; }, }, - environmentDeployments: { + parallelDeployments: { query: getProjectPagesDeployments, variables() { return { @@ -101,10 +101,10 @@ export default { updateQuery: this.fetchMoreUpdateResult, }); }, - fetchMoreEnvironmentDeployments() { - this.$apollo.queries.environmentDeployments.fetchMore({ + fetchMoreParallelDeployments() { + this.$apollo.queries.parallelDeployments.fetchMore({ variables: { - after: this.environmentDeployments.pageInfo.endCursor, + after: this.parallelDeployments.pageInfo.endCursor, }, updateQuery: this.fetchMoreUpdateResult, }); @@ -194,32 +194,32 @@ export default { @load-more="fetchMorePrimaryDeployments" /> </div> - <div v-if="loadedEnvironmentDeploymentsCount > 0" data-testid="environment-deployment-list"> - <h3 class="gl-heading-3">{{ $options.i18n.environmentDeploymentsTitle }}</h3> + <div v-if="loadedParallelDeploymentsCount > 0" data-testid="parallel-deployment-list"> + <h3 class="gl-heading-3">{{ $options.i18n.parallelDeploymentsTitle }}</h3> <div class="gl-flex gl-flex-col gl-gap-4"> <pages-deployment - v-for="node in environmentDeployments.nodes" + v-for="node in parallelDeployments.nodes" :key="node.id" :deployment="node" - :query="$apollo.queries.environmentDeployments" - data-testid="environment-deployment" + :query="$apollo.queries.parallelDeployments" + data-testid="parallel-deployment" @error="onChildError" /> </div> <load-more-deployments - v-if="environmentDeployments && environmentDeployments.pageInfo.hasNextPage" - :total-deployment-count="environmentDeploymentsNotLoaded" - :loading="$apollo.queries.environmentDeployments.loading" + v-if="parallelDeployments && parallelDeployments.pageInfo.hasNextPage" + :total-deployment-count="parallelDeploymentsNotLoaded" + :loading="$apollo.queries.parallelDeployments.loading" class="gl-mt-3" - data-testid="load-more-environment-deployments" - @load-more="fetchMoreEnvironmentDeployments" + data-testid="load-more-parallel-deployments" + @load-more="fetchMoreParallelDeployments" /> </div> - <div v-if="!primaryDeployments && !environmentDeployments && $apollo.loading"> + <div v-if="!primaryDeployments && !parallelDeployments && $apollo.loading"> <gl-loading-icon size="md" /> </div> <div - v-else-if="!loadedPrimaryDeploymentsCount && !loadedEnvironmentDeploymentsCount" + v-else-if="!loadedPrimaryDeploymentsCount && !loadedParallelDeploymentsCount" class="gl-text-center gl-text-secondary" > {{ $options.i18n.noDeploymentsMessage }} diff --git a/app/views/admin/application_settings/_pages.html.haml b/app/views/admin/application_settings/_pages.html.haml index 9c462ba28e6240a0d3eb51bed71ab87b881762cf..7e36e4c52ef7bc5529e3d49830673356bf6e8314 100644 --- a/app/views/admin/application_settings/_pages.html.haml +++ b/app/views/admin/application_settings/_pages.html.haml @@ -28,11 +28,11 @@ - link = link_to('', help_page_path('administration/pages/index', anchor: 'set-maximum-number-of-gitlab-pages-custom-domains-for-a-project'), target: '_blank', rel: 'noopener noreferrer') = safe_format(s_('AdminSettings|Set the maximum number of GitLab Pages custom domains per project (0 for unlimited). %{link_start}Learn more%{link_end}.'), tag_pair(link, :link_start, :link_end)) .form-group - = f.label :pages_extra_deployments_default_expiry_seconds, s_('AdminSettings|Default expiration time for extra deployments (in seconds)'), class: 'label-bold' + = f.label :pages_extra_deployments_default_expiry_seconds, s_('AdminSettings|Default expiration time for parallel deployments (in seconds)'), class: 'label-bold' = f.number_field :pages_extra_deployments_default_expiry_seconds, class: 'form-control gl-form-input' .form-text.text-muted - - link = link_to('', help_page_path('user/project/pages/index', anchor: 'create-multiple-deployments'), target: '_blank', rel: 'noopener noreferrer') - = safe_format(s_('AdminSettings|Set the default time after which extra deployments expire (0 for unlimited). %{link_start}What are extra deployments%{link_end}?'), tag_pair(link, :link_start, :link_end)) + - link = link_to('', help_page_path('user/project/pages/index', anchor: 'parallel-deployments'), target: '_blank', rel: 'noopener noreferrer') + = safe_format(s_('AdminSettings|Set the default time after which parallel deployments expire (0 for unlimited). %{link_start}What are parallel deployments%{link_end}?'), tag_pair(link, :link_start, :link_end)) %h5 = s_("AdminSettings|Configure Let's Encrypt") %p diff --git a/app/views/projects/pages/_pages_settings.html.haml b/app/views/projects/pages/_pages_settings.html.haml index a209fcd459e9573e8f45c341d9b06b56a6eb9545..fcfcd96bd7b2ad4827f01d87a0f13d07b8e9453e 100644 --- a/app/views/projects/pages/_pages_settings.html.haml +++ b/app/views/projects/pages/_pages_settings.html.haml @@ -24,11 +24,11 @@ .form-group = f.fields_for :project_setting do |settings| = settings.gitlab_ui_checkbox_component :pages_multiple_versions_enabled, - s_('GitLabPages|Use multiple deployments'), + s_('GitLabPages|Enable parallel deployments'), label_options: { class: 'label-bold' } %p.gl-pl-6 - = 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'), + = safe_format(s_("GitLabPages|When enabled, you can create parallel 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: 'parallel-deployments'), target: '_blank'), :docs_link_start, :link_end)) .gl-mt-3 diff --git a/doc/administration/instance_limits.md b/doc/administration/instance_limits.md index ab59573a7bd904e8ab5aff2e0b3f069afea3b04d..dc8de1b0e0d2eef19adca96b9e21dfb880c50e4c 100644 --- a/doc/administration/instance_limits.md +++ b/doc/administration/instance_limits.md @@ -686,10 +686,10 @@ The default limit for [GitLab self-managed](../subscriptions/self_managed/index. To set a limit on your self-managed instance, use the [**Admin** area](pages/index.md#set-maximum-number-of-gitlab-pages-custom-domains-for-a-project). -### Number of extra Pages deployments when using multiple deployments +### Number of parallel Pages deployments -When using [multiple Pages deployments](../user/project/pages/index.md#create-multiple-deployments), the total number -of extra Pages deployments permitted for a top-level namespace is 1000. +When using [parallel Pages deployments](../user/project/pages/index.md#parallel-deployments), the total number +of parallel Pages deployments permitted for a top-level namespace is 1000. ### Number of registered runners per scope diff --git a/doc/administration/pages/index.md b/doc/administration/pages/index.md index 2004d532735eb2297435602800f9e980a16e5884..097f81c28a78b8746336ae1feb1a53e85d1d3d7e 100644 --- a/doc/administration/pages/index.md +++ b/doc/administration/pages/index.md @@ -930,7 +930,7 @@ To set the maximum number of GitLab Pages custom domains for a project: 1. Enter a value for **Maximum number of custom domains per project**. Use `0` for unlimited domains. 1. Select **Save changes**. -## Configure the default expiry for extra deployments +## Configure the default expiry for parallel deployments > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/456477) in GitLab 17.4. @@ -939,14 +939,14 @@ Prerequisites: - You must have administrator access to the instance. To configure the default duration for the instance after which -[extra deployments](../../user/project/pages/index.md#create-multiple-deployments) +[parallel deployments](../../user/project/pages/index.md#parallel-deployments) are deleted: 1. On the left sidebar, at the bottom, select **Admin**. 1. Select **Settings > Preferences**. 1. Expand **Pages**. -1. Enter a value for **Default expiration for extra deployments in seconds**. - Use `0` if extra deployments should not expire by default. +1. Enter a value for **Default expiration for parallel deployments in seconds**. + Use `0` if parallel deployments should not expire by default. 1. Select **Save changes**. ## Set maximum number of files per GitLab Pages website diff --git a/doc/api/pages.md b/doc/api/pages.md index 5bf803d09a7484c9739795582a84533fa5528baa..4953cfaf76280a210c12f9cc52f85a86d71ac2e5 100644 --- a/doc/api/pages.md +++ b/doc/api/pages.md @@ -64,12 +64,12 @@ response attributes: | `force_https` | boolean | `true` if the project is set to force HTTPS. | | `deployments[]` | array | List of current active deployments. | -| `deployments[]` attribute | Type | Description | -| ----------------------------------------- | ---------- | ----------------------- | -| `created_at` | date | Date deployment was created. | -| `url` | string | URL for this deployment. | -| `path_prefix` | string | Path prefix of this deployment when using [multiple deployments](../user/project/pages/index.md#create-multiple-deployments). | -| `root_directory` | string | Root directory. | +| `deployments[]` attribute | Type | Description | +| ----------------------------------------- | ---------- |-------------------------------------------------------------------------------------------------------------------------------| +| `created_at` | date | Date deployment was created. | +| `url` | string | URL for this deployment. | +| `path_prefix` | string | Path prefix of this deployment when using [parallel deployments](../user/project/pages/index.md#parallel-deployments). | +| `root_directory` | string | Root directory. | Example request: @@ -133,12 +133,12 @@ response attributes: | `force_https` | boolean | `true` if the project is set to force HTTPS. | | `deployments[]` | array | List of current active deployments. | -| `deployments[]` attribute | Type | Description | -| ----------------------------------------- | ---------- | ----------------------- | -| `created_at` | date | Date deployment was created. | -| `url` | string | URL for this deployment. | -| `path_prefix` | string | Path prefix of this deployment when using [multiple deployments](../user/project/pages/index.md#create-multiple-deployments). | -| `root_directory` | string | Root directory. | +| `deployments[]` attribute | Type | Description | +| ----------------------------------------- | ---------- |-------------------------------------------------------------------------------------------------------------------------------| +| `created_at` | date | Date deployment was created. | +| `url` | string | URL for this deployment. | +| `path_prefix` | string | Path prefix of this deployment when using [parallel deployments](../user/project/pages/index.md#parallel-deployments). | +| `root_directory` | string | Root directory. | Example request: diff --git a/doc/ci/yaml/index.md b/doc/ci/yaml/index.md index ab0a84169cf2f30900a73590ee78734f9fefbc85..1ef7c1c9dc32b8e1a34cd6bbe0f62bf45b8bc32c 100644 --- a/doc/ci/yaml/index.md +++ b/doc/ci/yaml/index.md @@ -3471,7 +3471,7 @@ On self-managed GitLab, by default this feature is not available. To make it ava an administrator can [enable the feature flag](../../administration/feature_flags.md) named `pages_multiple_versions_setting`. On GitLab.com and GitLab Dedicated, this feature is not available. This feature is not ready for production use. -Use `pages.path_prefix` to configure a path prefix for [multiple deployments](../../user/project/pages/index.md#create-multiple-deployments) of GitLab Pages. +Use `pages.path_prefix` to configure a path prefix for [parallel deployments](../../user/project/pages/index.md#parallel-deployments) of GitLab Pages. **Keyword type**: Job keyword. You can use it only as part of a `pages` job. diff --git a/doc/user/gitlab_com/index.md b/doc/user/gitlab_com/index.md index a59a2d1e0747dac6c029f3ca653f9b47694f38f0..a9005b92ede7059f28b3fb2e0af0da08b318cd65 100644 --- a/doc/user/gitlab_com/index.md +++ b/doc/user/gitlab_com/index.md @@ -342,7 +342,7 @@ For self-managed instance limits, see: - [Webhook rate limit](../../administration/instance_limits.md#webhook-rate-limit). - [Number of webhooks](../../administration/instance_limits.md#number-of-webhooks). - [Webhook timeout](../../administration/instance_limits.md#webhook-timeout). -- [Multiple Pages deployments](../../administration/instance_limits.md#number-of-extra-pages-deployments-when-using-multiple-deployments). +- [Parallel Pages deployments](../../administration/instance_limits.md#number-of-parallel-pages-deployments). ## GitLab-hosted runners diff --git a/doc/user/project/pages/index.md b/doc/user/project/pages/index.md index e170c967002236afa9f1c0b11ee3fe060f41d3d5..9d290b9621d54708aacb572569d339b580948133 100644 --- a/doc/user/project/pages/index.md +++ b/doc/user/project/pages/index.md @@ -201,8 +201,8 @@ pages: - public ``` -By default, [extra deployments](#create-multiple-deployments) expire automatically after 24 hours. -To disable this behavior, set `pages.expire_in` to `never`. +By default, [parallel deployments](#parallel-deployments) expire +automatically after 24 hours. To disable this behavior, set `pages.expire_in` to `never`. Expired deployments are stopped by a cron job that runs every 10 minutes. Stopped deployments are subsequently deleted by another cron job that also @@ -228,7 +228,7 @@ To recover a stopped deployment that has not yet been deleted: list. 1. Expand the deployment you want to recover and select **Restore**. -## Create multiple deployments +## Parallel deployments DETAILS: **Tier:** Premium, Ultimate @@ -236,6 +236,7 @@ DETAILS: **Status:** Beta > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/129534) in GitLab 16.7 as an [experiment](../../../policy/experiment-beta-support.md) [with a flag](../../feature_flags.md) named `pages_multiple_versions_setting`, disabled by default. +> - [Renamed](https://gitlab.com/gitlab-org/gitlab/-/issues/480195) from "multiple deployments" to "parallel deployments" in GitLab 17.4. > - [Enabled on GitLab.com, self-managed, and GitLab Dedicated](https://gitlab.com/gitlab-org/gitlab/-/issues/422145) in GitLab 17.4. FLAG: @@ -246,8 +247,8 @@ This feature is available for testing, but not ready for production use. Use the [`pages.path_prefix`](../../../ci/yaml/index.md#pagespagespath_prefix) CI/CD option to configure a prefix for the GitLab Pages URL. A prefix allows you to differentiate between multiple GitLab Pages deployments: -- Main Pages deployment: a Pages deployment created with a blank `path_prefix`. -- Extra Pages deployment: a Pages deployment created with a non-blank `path_prefix` +- Main deployment: a Pages deployment created with a blank `path_prefix`. +- Parallel deployment: a Pages deployment created with a non-blank `path_prefix` The value of `pages.path_prefix` is: @@ -265,26 +266,27 @@ Consider a project such as `https://gitlab.example.com/namespace/project`. By de If a `pages.path_prefix` is configured to the project branch names, like `path_prefix = $CI_COMMIT_BRANCH`, and there's a -branch named `username/testing_feature`, this extra Pages deployment would be accessible through: +branch named `username/testing_feature`, this parallel Pages deployment would be accessible through: - When using a [unique domain](#unique-domains): `https://project-namespace-123456.gitlab.io/username-testing-feature`. - When not using a unique domain: `https://namespace.gitlab.io/project/username-testing-feature`. -### Enable multiple deployments +### Enable parallel deployments -To enable multiple GitLab Pages deployments: +To enable parallel 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 deployments**. +1. Select **Enable parallel deployments**. ### Limits -The number of extra deployments is limited by the root-level namespace. For specific limits for: +The number of parallel deployments is limited by the root-level namespace. For +specific limits for: - GitLab.com, see [Other limits](../../gitlab_com/index.md#other-limits). - Self-managed GitLab instances, see - [Number of extra Pages deployments when using multiple deployments](../../../administration/instance_limits.md#number-of-extra-pages-deployments-when-using-multiple-deployments). + [Number of parallel Pages deployments](../../../administration/instance_limits.md#number-of-parallel-pages-deployments). To immediately reduce the number of active deployments in your namespace, delete some deployments. For more information, see @@ -296,9 +298,9 @@ delete older deployments, see ### Expiration -By default, extra deployments expire after 24 hours, after which they are deleted. -If you're using a self-hosted instance, your instance admin can -[configure a different default duration](../../../administration/pages/index.md#configure-the-default-expiry-for-extra-deployments). +By default, parallel deployments expire after 24 hours, after which they are +deleted. If you're using a self-hosted instance, your instance admin can +[configure a different default duration](../../../administration/pages/index.md#configure-the-default-expiry-for-parallel-deployments). To customize the expiry time, [configure `pages.expire_in`](#expiring-deployments). @@ -353,9 +355,9 @@ Some other examples of mixing [variables](../../../ci/variables/index.md) with s - `pages.path_prefix: '_${CI_MERGE_REQUEST_IID}_'`: Merge request number prefixed ans suffixed with `_`, like `_123_`. -### Use multiple deployments to create pages environments +### Use parallel deployments to create Pages environments -You can use multiple GitLab Pages deployments to create a new [environment](../../../ci/environments/index.md). +You can use parallel GitLab Pages deployments to create a new [environment](../../../ci/environments/index.md). For example: ```yaml @@ -407,5 +409,5 @@ To restore a stopped deployment that has not been deleted yet, see #### Auto-clean -Extra Pages deployments, created by a merge request with a `path_prefix`, are automatically deleted when the +Parallel Pages deployments, created by a merge request with a `path_prefix`, are automatically deleted when the merge request is closed or merged. diff --git a/ee/app/assets/javascripts/usage_quotas/pages/components/project.vue b/ee/app/assets/javascripts/usage_quotas/pages/components/project.vue index 18ade8bcfb9431c6fa986dd7e2b722f3f2fe51ae..b9180d8ccce6c2e680970c167e9cdf6bb4eddcbe 100644 --- a/ee/app/assets/javascripts/usage_quotas/pages/components/project.vue +++ b/ee/app/assets/javascripts/usage_quotas/pages/components/project.vue @@ -37,10 +37,9 @@ export default { restoreError: s__( 'Pages|Restoring the deployment failed. The deployment might be permanently deleted.', ), - extraDeploymentsLabel: s__('Pages|Extra deployments: %{count}'), + extraDeploymentsLabel: s__('Pages|Parallel deployments: %{count}'), activeState: s__('Pages|Active'), stoppedState: s__('Pages|Stopped'), - primaryDeploymentTitle: s__('Pages|Primary deployment'), pathPrefixLabel: s__('Pages|Path prefix'), createdLabel: s__('Pages|Created'), deployJobLabel: s__('Pages|Deploy job'), diff --git a/ee/app/assets/javascripts/usage_quotas/pages/components/project_list.vue b/ee/app/assets/javascripts/usage_quotas/pages/components/project_list.vue index e57a549880c14f665739db84e8524e3aa4f066a4..9df110e716e6c6213c7aac808dbecb52b3c5555e 100644 --- a/ee/app/assets/javascripts/usage_quotas/pages/components/project_list.vue +++ b/ee/app/assets/javascripts/usage_quotas/pages/components/project_list.vue @@ -68,7 +68,7 @@ export default { v-else-if="!hasResults" :title="__('No projects found')" :description=" - s__('Pages|We did not find any Projects with Pages deployments in this namespace.') + s__('Pages|We did not find any projects with parallel Pages deployments in this namespace.') " :svg-path="$options.EMPTY_STATE_SVG_URL" /> diff --git a/ee/app/assets/javascripts/usage_quotas/pages/components/stats.vue b/ee/app/assets/javascripts/usage_quotas/pages/components/stats.vue index 0d7ce6e697f002843f585ccca7a9d014d3490f90..53d321f9162cf429f51ef41425164f3496ca436e 100644 --- a/ee/app/assets/javascripts/usage_quotas/pages/components/stats.vue +++ b/ee/app/assets/javascripts/usage_quotas/pages/components/stats.vue @@ -11,8 +11,8 @@ export default { helpLink: `${DOCS_URL_IN_EE_DIR}/user/project/pages/#limits`, }, i18n: { - description: s__('PagesUsageQuota|Active extra deployments'), - helpText: s__('PagesUsageQuota|Learn about Pages deployments limits'), + description: s__('PagesUsageQuota|Parallel deployments'), + helpText: s__('PagesUsageQuota|Learn about limits for Pages deployments'), }, computed: { percentage() { diff --git a/ee/spec/frontend/usage_quotas/pages/components/project_spec.js b/ee/spec/frontend/usage_quotas/pages/components/project_spec.js index 35feaa4806007185f26e7252ed58a044b4642648..b9a9ba5cce8cf42a43c02dcd147c251bdf6fd7cf 100644 --- a/ee/spec/frontend/usage_quotas/pages/components/project_spec.js +++ b/ee/spec/frontend/usage_quotas/pages/components/project_spec.js @@ -59,7 +59,7 @@ describe('ProjectView', () => { }); it('displays the correct number of total deployments', () => { - expect(wrapper.text().replace(/\s\s+/g, ' ')).toContain('Extra deployments: 100'); + expect(wrapper.text().replace(/\s\s+/g, ' ')).toContain('Parallel deployments: 100'); }); it('renders the correct number of deployment rows', () => { diff --git a/ee/spec/frontend/usage_quotas/pages/components/stats_spec.js b/ee/spec/frontend/usage_quotas/pages/components/stats_spec.js index 82fb127345250bafb1b4453544c98330df8b2a35..9794280e51cb2c0cf3cf5a59426ad8dcf3c3983f 100644 --- a/ee/spec/frontend/usage_quotas/pages/components/stats_spec.js +++ b/ee/spec/frontend/usage_quotas/pages/components/stats_spec.js @@ -32,12 +32,12 @@ describe('PagesDeploymentsStats', () => { const statisticsCard = wrapper.findComponent(StatisticsCard); expect(statisticsCard.props('usageValue')).toBe(`${deploymentsCount}`); expect(statisticsCard.props('totalValue')).toBe(deploymentsLimit); - expect(statisticsCard.props('description')).toBe('Active extra deployments'); + expect(statisticsCard.props('description')).toBe('Parallel deployments'); expect(statisticsCard.props('helpLink')).toBe( `${DOCS_URL_IN_EE_DIR}/user/project/pages/#limits`, ); - expect(statisticsCard.props('helpLabel')).toBe('Learn about Pages deployments limits'); - expect(statisticsCard.props('helpTooltip')).toBe('Learn about Pages deployments limits'); + expect(statisticsCard.props('helpLabel')).toBe('Learn about limits for Pages deployments'); + expect(statisticsCard.props('helpTooltip')).toBe('Learn about limits for Pages deployments'); expect(statisticsCard.props('percentage')).toBe(50); }); }); diff --git a/locale/gitlab.pot b/locale/gitlab.pot index b0102540df8641d308837f43fdcc8b0d38ac25d8..ca46bc0e534f52d872a40d7f8a602c960c09a56b 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -4033,7 +4033,7 @@ msgstr "" msgid "AdminSettings|Cube API URL" msgstr "" -msgid "AdminSettings|Default expiration time for extra deployments (in seconds)" +msgid "AdminSettings|Default expiration time for parallel deployments (in seconds)" msgstr "" msgid "AdminSettings|Delete inactive projects" @@ -4297,7 +4297,7 @@ msgstr "" msgid "AdminSettings|Set options for cost factors of forks" msgstr "" -msgid "AdminSettings|Set the default time after which extra deployments expire (0 for unlimited). %{link_start}What are extra deployments%{link_end}?" +msgid "AdminSettings|Set the default time after which parallel deployments expire (0 for unlimited). %{link_start}What are parallel deployments%{link_end}?" msgstr "" msgid "AdminSettings|Set the expiration time of authentication tokens of newly registered group runners." @@ -24628,6 +24628,9 @@ msgstr "" msgid "GitLabPages|Edit" msgstr "" +msgid "GitLabPages|Enable parallel deployments" +msgstr "" + msgid "GitLabPages|Expired" msgstr "" @@ -24676,9 +24679,6 @@ msgstr "" msgid "GitLabPages|Updating your Pages configuration..." msgstr "" -msgid "GitLabPages|Use multiple deployments" -msgstr "" - msgid "GitLabPages|Use unique domain" msgstr "" @@ -24694,7 +24694,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 deployments of your pages site. %{docs_link_start}Learn More.%{link_end}" +msgid "GitLabPages|When enabled, you can create parallel 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}" @@ -38998,10 +38998,10 @@ msgstr "" msgid "PagesDomain|Certificate Key is too long. (Max %d bytes)" msgstr "" -msgid "PagesUsageQuota|Active extra deployments" +msgid "PagesUsageQuota|Learn about limits for Pages deployments" msgstr "" -msgid "PagesUsageQuota|Learn about Pages deployments limits" +msgid "PagesUsageQuota|Parallel deployments" msgstr "" msgid "Pages|+ %{n} more deployments" @@ -39037,21 +39037,12 @@ msgstr "" msgid "Pages|Deployments" msgstr "" -msgid "Pages|Environment deployments" -msgstr "" - msgid "Pages|Expires at" msgstr "" -msgid "Pages|Extra deployments: %{count}" -msgstr "" - msgid "Pages|Files" msgstr "" -msgid "Pages|Include stopped deployments" -msgstr "" - msgid "Pages|Last updated" msgstr "" @@ -39061,6 +39052,12 @@ msgstr "" msgid "Pages|Pages deployments" msgstr "" +msgid "Pages|Parallel deployments" +msgstr "" + +msgid "Pages|Parallel deployments: %{count}" +msgstr "" + msgid "Pages|Path prefix" msgstr "" @@ -39079,6 +39076,9 @@ msgstr "" msgid "Pages|Scheduled for deletion at" msgstr "" +msgid "Pages|Show stopped deployments" +msgstr "" + msgid "Pages|Size" msgstr "" @@ -39100,7 +39100,7 @@ msgstr "" msgid "Pages|URL" msgstr "" -msgid "Pages|We did not find any Projects with Pages deployments in this namespace." +msgid "Pages|We did not find any projects with parallel Pages deployments in this namespace." msgstr "" msgid "Pagination|First" diff --git a/spec/frontend/gitlab_pages/components/deployments_spec.js b/spec/frontend/gitlab_pages/components/deployments_spec.js index 980b4aacd38e23f45a1a0ee48650e06cc91360a8..6fbb4ee9dbb21882f06db01fe7642a936acee9e2 100644 --- a/spec/frontend/gitlab_pages/components/deployments_spec.js +++ b/spec/frontend/gitlab_pages/components/deployments_spec.js @@ -54,11 +54,11 @@ describe('PagesDeployments', () => { }); const findAllPrimaryDeployments = () => wrapper.findAllByTestId('primary-deployment'); - const findAllEnvironmentDeployments = () => wrapper.findAllByTestId('environment-deployment'); + const findAllParallelDeployments = () => wrapper.findAllByTestId('parallel-deployment'); const findPrimaryDeploymentsLoadMoreComponent = () => wrapper.findByTestId('load-more-primary-deployments'); - const findEnvironmentDeploymentsLoadMoreComponent = () => - wrapper.findByTestId('load-more-environment-deployments'); + const findParallelDeploymentsLoadMoreComponent = () => + wrapper.findByTestId('load-more-parallel-deployments'); const createComponent = () => { wrapper = shallowMountExtended(PagesDeployments, { @@ -95,7 +95,7 @@ describe('PagesDeployments', () => { ); }); - it('calls the environments deployments query', () => { + it('calls the parallels deployments query', () => { expect(getProjectPagesDeploymentsQueryHandler).toHaveBeenCalledWith( expect.objectContaining({ active: true, @@ -109,8 +109,8 @@ describe('PagesDeployments', () => { expect(findAllPrimaryDeployments().length).toBe(10); }); - it('renders a list for all environment deployments', () => { - expect(findAllEnvironmentDeployments().length).toBe(10); + it('renders a list for all parallel deployments', () => { + expect(findAllParallelDeployments().length).toBe(10); }); }); @@ -124,8 +124,8 @@ describe('PagesDeployments', () => { expect(findPrimaryDeploymentsLoadMoreComponent().exists()).toBe(true); }); - it('does include the "load more" component for environment deployments', () => { - expect(findEnvironmentDeploymentsLoadMoreComponent().exists()).toBe(true); + it('does include the "load more" component for parallel deployments', () => { + expect(findParallelDeploymentsLoadMoreComponent().exists()).toBe(true); }); it('fetches more primary deployments', async () => { @@ -144,8 +144,8 @@ describe('PagesDeployments', () => { expect(findPrimaryDeploymentsLoadMoreComponent().exists()).toBe(false); }); - it('fetches more environment deployments', async () => { - findEnvironmentDeploymentsLoadMoreComponent().vm.$emit('load-more'); + it('fetches more parallel deployments', async () => { + findParallelDeploymentsLoadMoreComponent().vm.$emit('load-more'); await nextTick(); expect(getProjectPagesDeploymentsQueryHandler).toHaveBeenCalledWith( @@ -157,7 +157,7 @@ describe('PagesDeployments', () => { await waitForPromises(); - expect(findEnvironmentDeploymentsLoadMoreComponent().exists()).toBe(false); + expect(findParallelDeploymentsLoadMoreComponent().exists()).toBe(false); }); }); @@ -177,7 +177,7 @@ describe('PagesDeployments', () => { ); }); - it('fetches the environmentDeployments with the "active" filter set to undefined', () => { + it('fetches the parallelDeployments with the "active" filter set to undefined', () => { expect(getProjectPagesDeploymentsQueryHandler).toHaveBeenCalledWith( expect.objectContaining({ versioned: true, @@ -188,9 +188,9 @@ describe('PagesDeployments', () => { }); describe.each` - type | testid - ${'primary'} | ${'primary-deployment'} - ${'environment'} | ${'environment-deployment'} + type | testid + ${'primary'} | ${'primary-deployment'} + ${'parallel'} | ${'parallel-deployment'} `('if a $type PagesDeployment child emits an error', ({ testid }) => { const errorMessage = 'Foo'; 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 ba276bc6070192b076eafa52ece49eaf72e764cd..d88988110d7e0c0c04049e867de07051ee5b8ff6 100644 --- a/spec/views/projects/pages/_pages_settings.html.haml_spec.rb +++ b/spec/views/projects/pages/_pages_settings.html.haml_spec.rb @@ -20,7 +20,7 @@ end context 'for pages multiple versions' do - context 'when current user does not have access to pages multiple versions toggle' do + context 'when current user does not have access to pages parallel deployments toggle' do it 'shows the multiple versions toggle' do allow(view) .to receive(:can?) @@ -29,7 +29,7 @@ render - expect(rendered).not_to have_content('Use multiple versions') + expect(rendered).not_to have_content('Enable parallel deployments') end end @@ -42,7 +42,7 @@ render - expect(rendered).to have_content('Use multiple deployments') + expect(rendered).to have_content('Enable parallel deployments') end end end