Merge branch 'importing-fix' into 'master'

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)

doc/workflow/import_projects_from_bitbucket.md

+# 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"
+
+![New project in GitLab](bitbucket_importer/bitbucket_import_new_project.jpg)
+
+3. Click on the "Bitbucket" button
+
+![Bitbucket](bitbucket_importer/bitbucket_import_select_bitbucket.jpg)
+
+4. Grant GitLab access to your Bitbucket account
+
+![Grant access](bitbucket_importer/bitbucket_import_grant_access.jpg)
+
+5. Click on the projects that you'd like to import or "Import all projects"
+
+![Import projects](bitbucket_importer/bitbucket_import_select_project.png)
+
+A new GitLab project will be created with your imported data.

doc/workflow/import_projects_from_github.md

-# 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.
 
-![New project page](github_importer/new_project_page.png) 
+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.
+![New project page](github_importer/new_project_page.png)
+
+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.
 
 ![Importer page](github_importer/importer.png)
 
-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.

doc/workflow/importing/README.md

+# 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)