Commit a06e74d6 authored by Nick Gaskill's avatar Nick Gaskill

Merge branch 'eread/edit-the-edit-of-import-topics' into 'master'

Followup edits of import topic edits

See merge request gitlab-org/gitlab!61310
parents e90e6d49 5603bb40
......@@ -22,10 +22,8 @@ The Bitbucket importer can import:
- Pull requests (GitLab 11.2+)
- Pull request comments (GitLab 11.2+)
When importing:
- Repository public access is retained. If a repository is private in Bitbucket, it's created as
private in GitLab as well.
When importing, repository public access is retained. If a repository is private in Bitbucket, it's
created as private in GitLab as well.
## Limitations
......
......@@ -21,10 +21,8 @@ The Gitea importer can import:
- Milestones (GitLab 8.15+)
- Labels (GitLab 8.15+)
When importing:
- Repository public access is retained. If a repository is private in Gitea it's created as private
in GitLab as well.
When importing, repository public access is retained. If a repository is private in Gitea, it's
created as private in GitLab as well.
## How it works
......@@ -78,9 +76,9 @@ From there, you can see the import statuses of your Gitea repositories.
You also can:
- Import all your Gitea projects in one go by hitting **Import all projects** in
the upper left corner
the upper left corner.
- Filter projects by name. If filter is applied, hitting **Import all projects**
only imports matched projects
only imports matched projects.
![Gitea importer page](img/import_projects_from_gitea_importer_v12_3.png)
......
......@@ -59,7 +59,7 @@ 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.
To import Jira issues to a GitLab project, follow these steps:
To import Jira issues to a GitLab project:
1. On the **{issues}** **Issues** page, click **Import Issues** (**{import}**) **> Import from Jira**.
......
......@@ -51,13 +51,13 @@ As a result, the following projects are created:
## Import the repositories
Follow these steps to start the import:
To start the import:
1. From your GitLab dashboard click **New project**
1. Switch to the **Import project** tab
1. Click on the **Manifest file** button
1. Provide GitLab with a manifest XML file
1. Select a group you want to import to (you need to create a group first if you don't have one)
1. From your GitLab dashboard click **New project**.
1. Switch to the **Import project** tab.
1. Click on the **Manifest file** button.
1. Provide GitLab with a manifest XML file.
1. Select a group you want to import to (you need to create a group first if you don't have one).
1. Click **List available repositories**. At this point, you are redirected
to the import status page with projects list based on the manifest file.
1. Check the list and click **Import all repositories** to start the import.
......
......@@ -16,7 +16,7 @@ There are two approaches to SVN to Git migration:
- [Git/SVN Mirror](#smooth-migration-with-a-gitsvn-mirror-using-subgit) which:
- Makes the GitLab repository to mirror the SVN project.
- Git and SVN repositories are kept in sync; you can use either one.
- Smoothens the migration process and allows to manage migration risks.
- Smoothens the migration process and allows you to manage migration risks.
- [Cut over migration](#cut-over-migration-with-svn2git) which:
- Translates and imports the existing data and history from SVN to Git.
......
......@@ -46,12 +46,8 @@ Advantages of migrating to Git/GitLab:
Migration options from TFVC to Git depend on your operating system.
- If you're migrating on Microsoft Windows:
- Use the [`git-tfs`](https://github.com/git-tfs/git-tfs)
tool. See [Migrate TFS to Git](https://github.com/git-tfs/git-tfs/blob/master/doc/usecases/migrate_tfs_to_git.md)
for details.
- If you're on a Unix-based system:
- Follow the procedures described with this [TFVC to Git migration tool](https://github.com/turbo/gtfotfs).
- If you're migrating on Microsoft Windows, use the [`git-tfs`](https://github.com/git-tfs/git-tfs)
tool. See [Migrate TFS to Git](https://github.com/git-tfs/git-tfs/blob/master/doc/usecases/migrate_tfs_to_git.md)
for details.
- If you're on a Unix-based system, follow the procedures described with this
[TFVC to Git migration tool](https://github.com/turbo/gtfotfs).
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment