diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-29 00:10:29 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-29 00:10:29 +0300 |
| commit | e994d22d1d0b24e6920a6cf7202601c8318ec0a2 (patch) | |
| tree | e907993c8f9cf5585fad09dcf2e1e5049f2ecb3a /doc/user/project/import | |
| parent | dce57587960022ca3582bedfc5bcf356893fe603 (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 | 3 | ||||
| -rw-r--r-- | doc/user/project/import/index.md | 6 |
2 files changed, 0 insertions, 9 deletions
diff --git a/doc/user/project/import/bitbucket.md b/doc/user/project/import/bitbucket.md index 89130d5822f..56266718d12 100644 --- a/doc/user/project/import/bitbucket.md +++ b/doc/user/project/import/bitbucket.md @@ -76,6 +76,3 @@ If you've accidentally started the import process with the wrong account, follow 1. Revoke GitLab access to your Bitbucket account, essentially reversing the process in the following procedure: [Import your Bitbucket repositories](#import-your-bitbucket-repositories). 1. Sign out of the Bitbucket account. Follow the procedure linked from the previous step. - -NOTE: **Note:** -To import a repository including LFS objects from a Bitbucket server repository, use the [Repo by URL](../import/repo_by_url.md) importer. diff --git a/doc/user/project/import/index.md b/doc/user/project/import/index.md index 93a8b30aebc..86b671c8371 100644 --- a/doc/user/project/import/index.md +++ b/doc/user/project/import/index.md @@ -30,12 +30,6 @@ repository is too large the import can timeout. There is also the option of [connecting your external repository to get CI/CD benefits](../../../ci/ci_cd_for_external_repos/index.md). **(PREMIUM)** -## LFS authentication - -When importing a project that contains LFS objects, if the project has an -`.lfsconfig` file with the user/password set on the URL, this authentication -information will take precedence over the import authentication data. - ## Migrating from self-managed GitLab to GitLab.com 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. |