diff --git a/app/assets/javascripts/import_entities/import_groups/components/import_table.vue b/app/assets/javascripts/import_entities/import_groups/components/import_table.vue index 46fc6153b38d1134af1e45d9bdb825149f46d528..f60f242e56df95b7ae381a37ddd1453220b30989 100644 --- a/app/assets/javascripts/import_entities/import_groups/components/import_table.vue +++ b/app/assets/javascripts/import_entities/import_groups/components/import_table.vue @@ -637,7 +637,6 @@ export default { gitlabLogo: window.gon.gitlab_logo, PAGE_SIZES, permissionsHelpPath: helpPagePath('user/permissions', { anchor: 'group-members-permissions' }), - betaFeatureHelpPath: helpPagePath('policy/experiment-beta-support', { anchor: 'beta-features' }), popoverOptions: { title: __('What is listed here?') }, i18n, LOCAL_STORAGE_KEY: 'gl-bulk-imports-status-page-size-v1', @@ -803,23 +802,6 @@ export default { data-testid="import-projects-warning" /> </span> - - <span class="gl-ml-3"> - <gl-icon name="information-o" :size="12" class="gl-text-blue-600" /> - <gl-sprintf - :message=" - s__( - 'BulkImport|Importing projects is a %{docsLinkStart}Beta%{docsLinkEnd} feature.', - ) - " - > - <template #docsLink="{ content }" - ><gl-link :href="$options.betaFeatureHelpPath" target="_blank">{{ - content - }}</gl-link></template - > - </gl-sprintf> - </span> </div> <gl-table ref="table" diff --git a/doc/administration/settings/import_and_export_settings.md b/doc/administration/settings/import_and_export_settings.md index c6830d1c32110988d85312675c353d4b2224e89e..2dbc79bc82c7950c2683352fb5dfc54d91b4b005 100644 --- a/doc/administration/settings/import_and_export_settings.md +++ b/doc/administration/settings/import_and_export_settings.md @@ -39,18 +39,12 @@ To enable the export of ## Enable migration of groups and projects by direct transfer -DETAILS: -**Status:** Beta - > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/383268) in GitLab 15.8. +> - [Generally available](https://gitlab.com/gitlab-org/gitlab/-/issues/461326) in GitLab 17.1. WARNING: In GitLab 16.1 and earlier, you should **not** use direct transfer with [scheduled scan execution policies](../../user/application_security/policies/scan-execution-policies.md). If using direct transfer, first upgrade to GitLab 16.2 and ensure security policy bots are enabled in the projects you are enforcing. -WARNING: -This feature is in [beta](../../policy/experiment-beta-support.md#beta) and subject to change without notice. -This feature is not ready for production use. - Migration of groups and projects by direct transfer is disabled by default. To enable migration of groups and projects by direct transfer: diff --git a/doc/api/bulk_imports.md b/doc/api/bulk_imports.md index 28350fe7cdf7af12561081ccd16696485930af6f..b5cda2dbaf3d5832e2bd756267ecdacd1fb6173b 100644 --- a/doc/api/bulk_imports.md +++ b/doc/api/bulk_imports.md @@ -15,10 +15,6 @@ DETAILS: With the group migration by direct transfer API, you can start and view the progress of migrations initiated with [group migration by direct transfer](../user/group/import/index.md). -WARNING: -Migrating projects with this API is in [beta](../policy/experiment-beta-support.md#beta). This feature is not -ready for production use. - ## Prerequisites For information on prerequisites for group migration by direct transfer API, see @@ -31,7 +27,7 @@ prerequisites for [migrating groups by direct transfer](../user/group/import/ind Use this endpoint to start a new group or project migration. Specify: - `entities[group_entity]` to migrate a group. -- `entities[project_entity]` to migrate a project. (**Status:** Beta) +- `entities[project_entity]` to migrate a project. ```plaintext POST /bulk_imports diff --git a/doc/user/group/import/index.md b/doc/user/group/import/index.md index 880f9ffbf0031b62f566aa2ab0b44936ec255649..6b6675bac8f0bf47fa99c2f6dbff3322d9fa8fed 100644 --- a/doc/user/group/import/index.md +++ b/doc/user/group/import/index.md @@ -43,19 +43,13 @@ Migrating groups by direct transfer copies the groups from one place to another. - The subgroup of any existing top-level group. - Another GitLab instance, including GitLab.com. - In the [API](../../../api/bulk_imports.md), copy top-level groups and subgroups to these locations. -- Copy groups with projects (in [beta](../../../policy/experiment-beta-support.md#beta) and not ready for production - use) or without projects. Copying projects with groups is available: - - On GitLab.com by default. +- Copy groups with projects or without projects. Not all group and project resources are copied. See list of copied resources below: - [Migrated group items](#migrated-group-items). - [Migrated project items](#migrated-project-items). -WARNING: -Importing groups with projects is in [beta](../../../policy/experiment-beta-support.md#beta). This feature is not -ready for production use. - We invite you to leave your feedback about migrating by direct transfer in [the feedback issue](https://gitlab.com/gitlab-org/gitlab/-/issues/284495). @@ -282,10 +276,6 @@ role. 1. The **Status** column shows the import status of each group. If you leave the page open, it updates in real-time. 1. After a group has been imported, select its GitLab path to open its GitLab URL. -WARNING: -Importing groups with projects is in [beta](../../../policy/experiment-beta-support.md#beta). This feature is not -ready for production use. - ## Group import history > - **Partially completed** status [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/394727) in GitLab 16.7. @@ -406,12 +396,10 @@ Some group items are excluded from migration because they either: ## Migrated project items -DETAILS: -**Status:** Beta - > - [Enabled on GitLab.com](https://gitlab.com/gitlab-org/gitlab/-/issues/339941) in GitLab 15.6. > - `bulk_import_projects` feature flag [removed](https://gitlab.com/gitlab-org/gitlab/-/issues/339941) in GitLab 15.10. > - Project-only migrations using API [added](https://gitlab.com/gitlab-org/gitlab/-/issues/390515) in GitLab 15.11. +> - Migrating projects [generally available](https://gitlab.com/gitlab-org/gitlab/-/issues/461326) in GitLab 17.1. If you choose to migrate projects when you [select groups to migrate](#select-the-groups-and-projects-to-import), project items are migrated with the projects. @@ -436,10 +424,6 @@ Any other project items are **not** migrated. If you choose not to migrate projects along with groups or if you want to retry a project migration, you can initiate project-only migrations using the [API](../../../api/bulk_imports.md). -WARNING: -Migrating projects when migrating groups by direct transfer is in [beta](../../../policy/experiment-beta-support.md#beta) -and is not ready for production use. - Project items that are migrated to the destination GitLab instance include: | Project item | Introduced in | @@ -604,7 +588,7 @@ instance. ### Mismatched group or project path names -If a source group or project path doesn't conform to naming [limitations](../../reserved_names.md#limitations-on-usernames-project-and-group-names), the path is normalized to +If a source group or project path doesn't conform to naming [limitations](../../reserved_names.md#limitations-on-usernames-project-and-group-names), the path is normalized to ensure it is valid. For example, `Destination-Project-Path` is normalized to `destination-project-path`. ### Reducing migration duration diff --git a/locale/gitlab.pot b/locale/gitlab.pot index a6a10b3b1eaeb3bea092751064dc35bf4cd88735..b60aecd7582306fd598c23fdea3f35631c8b7b23 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -9632,9 +9632,6 @@ msgstr "" msgid "BulkImport|Import without projects" msgstr "" -msgid "BulkImport|Importing projects is a %{docsLinkStart}Beta%{docsLinkEnd} feature." -msgstr "" - msgid "BulkImport|Importing the group failed." msgstr ""