diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-05 00:09:29 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-05 00:09:29 +0300 |
commit | 839dad17a14654ff31c6c7d4de0f00b90499dc23 (patch) | |
tree | f67191a2fc05f143319f7ac26bd27a0a911cf8fd /doc/user/project/import | |
parent | ae42530b1be0d25186881ae45c39bdf1122a84b9 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user/project/import')
-rw-r--r-- | doc/user/project/import/bitbucket.md | 2 | ||||
-rw-r--r-- | doc/user/project/import/bitbucket_server.md | 4 | ||||
-rw-r--r-- | doc/user/project/import/gemnasium.md | 2 | ||||
-rw-r--r-- | doc/user/project/import/gitea.md | 2 | ||||
-rw-r--r-- | doc/user/project/import/github.md | 6 | ||||
-rw-r--r-- | doc/user/project/import/gitlab_com.md | 2 | ||||
-rw-r--r-- | doc/user/project/import/index.md | 2 | ||||
-rw-r--r-- | doc/user/project/import/jira.md | 2 | ||||
-rw-r--r-- | doc/user/project/import/phabricator.md | 2 |
9 files changed, 12 insertions, 12 deletions
diff --git a/doc/user/project/import/bitbucket.md b/doc/user/project/import/bitbucket.md index 0c44fdf0390..d413bcb5a27 100644 --- a/doc/user/project/import/bitbucket.md +++ b/doc/user/project/import/bitbucket.md @@ -7,7 +7,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w # Import your project from Bitbucket Cloud to GitLab -NOTE: **Note:** +NOTE: The Bitbucket Cloud importer works only with Bitbucket.org, not with Bitbucket Server (aka Stash). If you are trying to import projects from Bitbucket Server, use [the Bitbucket Server importer](bitbucket_server.md). diff --git a/doc/user/project/import/bitbucket_server.md b/doc/user/project/import/bitbucket_server.md index 25f83bf0bdf..bb2256c9464 100644 --- a/doc/user/project/import/bitbucket_server.md +++ b/doc/user/project/import/bitbucket_server.md @@ -9,7 +9,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/20164) in GitLab 11.2. -NOTE: **Note:** +NOTE: The Bitbucket Server importer does not work with [Bitbucket Cloud](https://bitbucket.org). Use the [Bitbucket Cloud importer](bitbucket.md) for that. @@ -70,7 +70,7 @@ namespace that started the import process. > - It's not recommended for production use. > - To use it in GitLab self-managed instances, ask a GitLab administrator to enable it. -CAUTION: **Warning:** +WARNING: This feature might not be available to you. Check the **version history** note above for details. If you've enabled this feature, the importer tries to find a user in the GitLab user database with diff --git a/doc/user/project/import/gemnasium.md b/doc/user/project/import/gemnasium.md index f3c17d6d0b5..448577c420e 100644 --- a/doc/user/project/import/gemnasium.md +++ b/doc/user/project/import/gemnasium.md @@ -107,7 +107,7 @@ back to both GitLab and GitHub when completed. ![Security Dashboard](../../application_security/security_dashboard/img/pipeline_security_dashboard_v13_3.png) -NOTE: **Note:** +NOTE: If you don't commit very often to your project, you may want to use [scheduled pipelines](../../../ci/pipelines/schedules.md) to run the job on a regular basis. diff --git a/doc/user/project/import/gitea.md b/doc/user/project/import/gitea.md index 3e92f7d127c..3ce1150fe03 100644 --- a/doc/user/project/import/gitea.md +++ b/doc/user/project/import/gitea.md @@ -11,7 +11,7 @@ Import your projects from Gitea to GitLab with minimal effort. ## Overview -NOTE: **Note:** +NOTE: This requires Gitea `v1.0.0` or newer. - At its current state, Gitea importer can import: diff --git a/doc/user/project/import/github.md b/doc/user/project/import/github.md index 769f104b226..a41230fa9bf 100644 --- a/doc/user/project/import/github.md +++ b/doc/user/project/import/github.md @@ -94,7 +94,7 @@ Before you begin, ensure that any GitHub users who you want to map to GitLab use User-matching attempts occur in that order, and if a user is not identified either way, the activity is associated with the user account that is performing the import. -NOTE: **Note:** +NOTE: If you are using a self-managed GitLab instance or if you are importing from GitHub Enterprise, this process requires that you have configured [GitHub integration](../../../integration/github.md). @@ -106,7 +106,7 @@ If you are using a self-managed GitLab instance or if you are importing from Git ### Using a GitHub token -NOTE: **Note:** +NOTE: Using a personal access token to import projects is not recommended. If you are a GitLab.com user, you can use a personal access token to import your project from GitHub, but this method cannot associate all user activity (such as issues and pull requests) with matching GitLab users. @@ -154,7 +154,7 @@ of the above are automatically configured. **(PREMIUM)** ## Improving the speed of imports on self-managed instances -NOTE: **Note:** +NOTE: Admin access to the GitLab server is required. For large projects it may take a while to import all data. To reduce the time necessary, you can increase the number of diff --git a/doc/user/project/import/gitlab_com.md b/doc/user/project/import/gitlab_com.md index 974e00990f2..add457c217e 100644 --- a/doc/user/project/import/gitlab_com.md +++ b/doc/user/project/import/gitlab_com.md @@ -13,7 +13,7 @@ mind that it is possible only if GitLab.com integration is enabled on your GitLa To get to the importer page you need to go to "New project" page. -NOTE: **Note:** +NOTE: If you are interested in importing Wiki and Merge Request data to your new instance, you'll need to follow the instructions for [exporting a project](../settings/import_export.md#exporting-a-project-and-its-data) diff --git a/doc/user/project/import/index.md b/doc/user/project/import/index.md index 563aae587c6..b38042416ab 100644 --- a/doc/user/project/import/index.md +++ b/doc/user/project/import/index.md @@ -47,7 +47,7 @@ All GitLab user associations (such as comment author) will be changed to the use If you need to migrate all data over, you can leverage our [API](../../../api/README.md) to migrate from self-managed to GitLab.com. The order of assets to migrate from a self-managed instance to GitLab.com is the following: -NOTE: **Note:** +NOTE: When migrating to GitLab.com, users would need to be manually created unless [SCIM](../../../user/group/saml_sso/scim_setup.md) is going to be used. Creating users with the API is limited to self-managed instances as it requires administrator access. 1. [Groups](../../../api/groups.md) diff --git a/doc/user/project/import/jira.md b/doc/user/project/import/jira.md index b54bd29e899..b97af3c516c 100644 --- a/doc/user/project/import/jira.md +++ b/doc/user/project/import/jira.md @@ -56,7 +56,7 @@ Make sure you have the integration set up before trying to import Jira issues. To import Jira issues to a GitLab project, follow the steps below. -NOTE: **Note:** +NOTE: Importing Jira issues is done as an asynchronous background job, which may result in delays based on import queues load, system load, or other factors. Importing large projects may take several minutes depending on the size of the import. diff --git a/doc/user/project/import/phabricator.md b/doc/user/project/import/phabricator.md index e83d70b5fc8..189afac1226 100644 --- a/doc/user/project/import/phabricator.md +++ b/doc/user/project/import/phabricator.md @@ -9,7 +9,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/60562) in GitLab 12.0. -CAUTION: **Caution:** +WARNING: The Phabricator task importer is in [beta](https://about.gitlab.com/handbook/product/gitlab-the-product/#beta) and is [**not** complete](https://gitlab.com/gitlab-org/gitlab/-/issues/284406). It imports |