diff --git a/doc/workflow/README.md b/doc/workflow/README.md index 4775be1504009bc3018e6f84aa737d086c5bf162..809b8d16abca5aae064c6a79f0a2526a5591a72e 100644 --- a/doc/workflow/README.md +++ b/doc/workflow/README.md @@ -8,9 +8,7 @@ - [Labels](labels.md) - [GitLab Flow](gitlab_flow.md) - [Notifications](notifications.md) -- [Migrating from SVN to GitLab](migrating_from_svn.md) -- [Project importing from GitHub to GitLab](import_projects_from_github.md) -- [Project importing from GitLab.com to your private GitLab instance](import_projects_from_gitlab_com.md) +- [Importing to GitLab](doc/importing/README.md) - [Two-factor Authentication (2FA)](two_factor_authentication.md) - [Protected branches](protected_branches.md) - [Change your time zone](timezone.md) diff --git a/doc/workflow/bitbucket_importer/bitbucket_import_grant_access.jpg b/doc/workflow/bitbucket_importer/bitbucket_import_grant_access.jpg new file mode 100644 index 0000000000000000000000000000000000000000..f3432e923c4a36640848615daec2b017b5f24ac1 Binary files /dev/null and b/doc/workflow/bitbucket_importer/bitbucket_import_grant_access.jpg differ diff --git a/doc/workflow/bitbucket_importer/bitbucket_import_new_project.jpg b/doc/workflow/bitbucket_importer/bitbucket_import_new_project.jpg new file mode 100644 index 0000000000000000000000000000000000000000..d0befa430b5d11459b803cd5c53984db02562deb Binary files /dev/null and b/doc/workflow/bitbucket_importer/bitbucket_import_new_project.jpg differ diff --git a/doc/workflow/bitbucket_importer/bitbucket_import_select_bitbucket.jpg b/doc/workflow/bitbucket_importer/bitbucket_import_select_bitbucket.jpg new file mode 100644 index 0000000000000000000000000000000000000000..53080e8104de6d6f62071dd8a99f9aebab15257b Binary files /dev/null and b/doc/workflow/bitbucket_importer/bitbucket_import_select_bitbucket.jpg differ diff --git a/doc/workflow/bitbucket_importer/bitbucket_import_select_project.png b/doc/workflow/bitbucket_importer/bitbucket_import_select_project.png new file mode 100644 index 0000000000000000000000000000000000000000..8312825eb18dedf77b33df4f1835050b7902328b Binary files /dev/null and b/doc/workflow/bitbucket_importer/bitbucket_import_select_project.png differ diff --git a/doc/workflow/import_projects_from_bitbucket.md b/doc/workflow/import_projects_from_bitbucket.md new file mode 100644 index 0000000000000000000000000000000000000000..341b1a5f86c9c13c5de55e6f3c8e53789ace517b --- /dev/null +++ b/doc/workflow/import_projects_from_bitbucket.md @@ -0,0 +1,23 @@ +# Import your project from Bitbucket to GitLab + +It takes just a few steps to import your existing Bitbucket projects to GitLab. But keep in mind that it is possible only if Bitbucket support is enabled on your GitLab instance. You can read more about Bitbucket support [here](doc/integration/bitbucket.md). + +1. Sign in to GitLab.com and go to your dashboard + +2. Click on "New project" + + + +3. Click on the "Bitbucket" button + + + +4. Grant GitLab access to your Bitbucket account + + + +5. Click on the projects that you'd like to import or "Import all projects" + + + +A new GitLab project will be created with your imported data. diff --git a/doc/workflow/import_projects_from_github.md b/doc/workflow/import_projects_from_github.md index 8644b4ffc73c23cb356fdee969de9aceef8dac91..c04906034c07d3a01ccdb2f2cd47481aa3c62dbd 100644 --- a/doc/workflow/import_projects_from_github.md +++ b/doc/workflow/import_projects_from_github.md @@ -1,13 +1,18 @@ -# Project importing from GitHub to GitLab +# Import your project from GitHub to GitLab -You can import your existing GitHub projects to GitLab. But keep in mind that it is possible only if +It takes just a couple of steps to import your existing GitHub projects to GitLab. Keep in mind that it is possible only if GitHub support is enabled on your GitLab instance. You can read more about GitHub support [here](http://doc.gitlab.com/ce/integration/github.html) -To get to the importer page you need to go to "New project" page. - +1. Sign in to GitLab.com and go to your dashboard. +2. To get to the importer page, you need to go to the "New project" page. -Click on the "Import project from GitHub" link and you will be redirected to GitHub for permission to access your projects. After accepting, you'll be automatically redirected to the importer. + + +3. Click on the "Import project from GitHub" link and you will be redirected to GitHub for permission to access your projects. After accepting, you'll be automatically redirected to the importer.  -To import a project, you can simple click "Add". The importer will import your repository and issues. Once the importer is done, a new GitLab project will be created with your imported data. \ No newline at end of file +4. To import a project, you can simple click "Add". The importer will import your repository and issues. Once the importer is done, a new GitLab project will be created with your imported data. + +### Note +When you import your projects from GitHub, it is not possible to keep your labels and milestones and issue numbers won't match. We are working on improving this in the near future. diff --git a/doc/workflow/importing/README.md b/doc/workflow/importing/README.md new file mode 100644 index 0000000000000000000000000000000000000000..3cab541f95543aeb2027d073a54452cf8ac5ddfc --- /dev/null +++ b/doc/workflow/importing/README.md @@ -0,0 +1,6 @@ +# Migrating projects to a GitLab instance + +1. [Bitbucket](doc/workflow/import_projects_from_bitbucket.md) +2. [GitHub](doc/workflow/import_projects_from_github.md) +3. [GitLab.com](doc/workflow/import_projects_from_gitlab_com.md) +4. [SVN](doc/workflow/migrating_from_svn.md)