diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-02 03:07:58 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-02 03:07:58 +0000 |
| commit | 47946d47f3d8906b622cb27605195ea0ffcb095c (patch) | |
| tree | 303828ea6907e388a52e9ebdebd7e4cbf7a63bcd /doc/user/project/import | |
| parent | 42263d6451c0af3c0e7a61747ffb046a806e4477 (diff) | |
| download | gitlab-ce-47946d47f3d8906b622cb27605195ea0ffcb095c.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user/project/import')
| -rw-r--r-- | doc/user/project/import/github.md | 11 | ||||
| -rw-r--r-- | doc/user/project/import/index.md | 2 |
2 files changed, 8 insertions, 5 deletions
diff --git a/doc/user/project/import/github.md b/doc/user/project/import/github.md index 175110cd535..a475dde59fd 100644 --- a/doc/user/project/import/github.md +++ b/doc/user/project/import/github.md @@ -40,10 +40,13 @@ in which case it defaults to the default project visibility. When issues and pull requests are being imported, the importer attempts to find their GitHub authors and assignees in the database of the GitLab instance (note that pull requests are called "merge requests" in GitLab). -For this association to succeed, prior to the import, each GitHub author and assignee in the repository must -have either previously logged in to a GitLab account using the GitHub icon **or** have a GitHub account with -a [primary email address](https://help.github.com/en/github/setting-up-and-managing-your-github-user-account/setting-your-commit-email-address) that -matches their GitLab account's email address. +For this association to succeed, each GitHub author and assignee in the repository +must meet one of the following conditions prior to the import: + +- Have previously logged in to a GitLab account using the GitHub icon. +- Have a GitHub account with a + [primary email address](https://help.github.com/en/github/setting-up-and-managing-your-github-user-account/setting-your-commit-email-address) + that matches their GitLab account's email address. If a user referenced in the project is not found in GitLab's database, the project creator (typically the user that initiated the import process) is set as the author/assignee, but a note on the issue mentioning the original diff --git a/doc/user/project/import/index.md b/doc/user/project/import/index.md index 8fd4325b5cd..ab2f942e911 100644 --- a/doc/user/project/import/index.md +++ b/doc/user/project/import/index.md @@ -24,7 +24,7 @@ There is also the option of [connecting your external repository to get CI/CD be ## Migrating from self-hosted GitLab to GitLab.com -If you only need to migrate Git repos, you can [import each project by URL](repo_by_url.md), but issues and merge requests can't be imported. +If you only need to migrate Git repos, you can [import each project by URL](repo_by_url.md). Issues and merge requests can't be imported. If you want to retain all metadata like issues and merge requests, you can use the [import/export feature](../settings/import_export.md) to export projects from self-hosted GitLab and import those projects into GitLab.com. |