summaryrefslogtreecommitdiff
path: root/doc/user
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-01-11 09:10:26 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2023-01-11 09:10:26 +0000
commite6b6fb602889e43e7a8dde760e01d0a3b2147c54 (patch)
tree70fabcff57d6d41c78f5a4a1a3579a209351c6be /doc/user
parent93d24281164be3ccf038a69f0daebc9049848240 (diff)
downloadgitlab-ce-e6b6fb602889e43e7a8dde760e01d0a3b2147c54.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user')
-rw-r--r--doc/user/project/import/index.md7
-rw-r--r--doc/user/project/integrations/apple_app_store.md3
2 files changed, 5 insertions, 5 deletions
diff --git a/doc/user/project/import/index.md b/doc/user/project/import/index.md
index 208bce90453..b86d50c1841 100644
--- a/doc/user/project/import/index.md
+++ b/doc/user/project/import/index.md
@@ -17,15 +17,16 @@ If you want to bring existing projects to GitLab or copy GitLab projects to a di
For any type of source and target, you can migrate projects:
-- As part of a [GitLab group migration](../../group/import/index.md). You can't migrate only chosen projects,
- but you can migrate many projects at once within a group.
+- When [migrating groups by direct transfer](../../group/import/index.md#migrate-groups-by-direct-transfer-recommended), which allows you to migrate all
+ projects in a group at once. Migrating projects by direct transfer is in [Beta](../../../policy/alpha-beta-support.md#beta-features). The feature is not ready
+ for production use.
- Using [file exports](../settings/import_export.md). With this method you can migrate projects one by one. No network
connection between instances is required.
If you only need to migrate Git repositories, you can [import each project by URL](repo_by_url.md). However, you can't
import issues and merge requests this way. To retain metadata like issues and merge requests, either:
-- [Migrate projects with groups](../../group/import/index.md).
+- [Migrate projects with groups by direct transfer](../../group/import/index.md#migrate-groups-by-direct-transfer-recommended). This feature is in [Beta](../../../policy/alpha-beta-support.md#beta-features). It is not ready for production use.
- Use [file exports](../settings/import_export.md) to import projects.
Keep in mind the limitations of [migrating using file exports](../settings/import_export.md#items-that-are-exported).
diff --git a/doc/user/project/integrations/apple_app_store.md b/doc/user/project/integrations/apple_app_store.md
index f381e71812c..f61fad4ab55 100644
--- a/doc/user/project/integrations/apple_app_store.md
+++ b/doc/user/project/integrations/apple_app_store.md
@@ -18,7 +18,7 @@ An Apple ID enrolled in the [Apple Developer Program](https://developer.apple.co
## Configure GitLab
-GitLab supports enabling the Apple App Store integration at the group or project level. Complete these steps in GitLab:
+GitLab supports enabling the Apple App Store integration at the project level. Complete these steps in GitLab:
1. In the Apple App Store Connect portal, generate a new private key for your project by following [these instructions](https://developer.apple.com/documentation/appstoreconnectapi/creating_api_keys_for_app_store_connect_api).
1. On the top bar, select **Main menu > Projects** and find your project.
@@ -36,7 +36,6 @@ After the Apple App Store integration is activated:
- The global variables `$APP_STORE_CONNECT_API_KEY_ISSUER_ID`, `$APP_STORE_CONNECT_API_KEY_KEY_ID`, and `$APP_STORE_CONNECT_API_KEY_KEY` are created for CI/CD use.
- `$APP_STORE_CONNECT_API_KEY_KEY` contains the Base64 encoded Private Key.
-- The project-level integration settings override the group-level integration settings.
## Security considerations