Commit fbe1ca39 authored by Job van der Voort's avatar Job van der Voort

Merge branch 'fixing_importing_doc' into 'master'

Fixing importing doc

Fixed some details about the importing links and documents.

- Added extra info to Bitbucket importing
- Organized docs in alphabetical order
- Moved Importing link to general documentation, instead of workflow (that's where Sytse asked me to add it)

Thank you @job for merging previous changes.

See merge request !1845
parents b637f849 ed42be40
# Documentation # Documentation
## User documentation ## User documentation
- [API](api/README.md) Automate GitLab via a simple and powerful API. - [API](api/README.md) Automate GitLab via a simple and powerful API.
- [Markdown](markdown/markdown.md) GitLab's advanced formatting system. - [GitLab as OAuth2 authentication service provider](integration/oauth_provider.md). It allows you to login to other applications from GitLab.
- [Permissions](permissions/permissions.md) Learn what each role in a project (guest/reporter/developer/master/owner) can do. - [Importing to GitLab](workflow/importing/README.md).
- [Project Services](project_services/project_services.md) Integrate a project with external services, such as CI and chat. - [Markdown](markdown/markdown.md) GitLab's advanced formatting system.
- [Public access](public_access/public_access.md) Learn how you can allow public and internal access to projects. - [Permissions](permissions/permissions.md) Learn what each role in a project (guest/reporter/developer/master/owner) can do.
- [SSH](ssh/README.md) Setup your ssh keys and deploy keys for secure access to your projects. - [Project Services](project_services/project_services.md) Integrate a project with external services, such as CI and chat.
- [Web hooks](web_hooks/web_hooks.md) Let GitLab notify you when new code has been pushed to your project. - [Public access](public_access/public_access.md) Learn how you can allow public and internal access to projects.
- [Workflow](workflow/README.md) Using GitLab functionality and importing projects from GitHub and SVN. - [SSH](ssh/README.md) Setup your ssh keys and deploy keys for secure access to your projects.
- [GitLab as OAuth2 authentication service provider](integration/oauth_provider.md). It allows you to login to other applications from GitLab. - [Web hooks](web_hooks/web_hooks.md) Let GitLab notify you when new code has been pushed to your project.
- [Workflow](workflow/README.md) Using GitLab functionality and importing projects from GitHub and SVN.
## Administrator documentation
## Administrator documentation
- [Install](install/README.md) Requirements, directory structures and installation from source.
- [Integration](integration/README.md) How to integrate with systems such as JIRA, Redmine, LDAP and Twitter. - [Custom git hooks](hooks/custom_hooks.md) Custom git hooks (on the filesystem) for when web hooks aren't enough.
- [Raketasks](raketasks/README.md) Backups, maintenance, automatic web hook setup and the importing of projects. - [Install](install/README.md) Requirements, directory structures and installation from source.
- [Custom git hooks](hooks/custom_hooks.md) Custom git hooks (on the filesystem) for when web hooks aren't enough. - [Integration](integration/README.md) How to integrate with systems such as JIRA, Redmine, LDAP and Twitter.
- [System hooks](system_hooks/system_hooks.md) Notifications when users, projects and keys are changed. - [Issue closing](customization/issue_closing.md) Customize how to close an issue from commit messages.
- [Security](security/README.md) Learn what you can do to further secure your GitLab instance. - [Libravatar](customization/libravatar.md) Use Libravatar for user avatars.
- [Update](update/README.md) Update guides to upgrade your installation. - [Log system](logs/logs.md) Log system.
- [Welcome message](customization/welcome_message.md) Add a custom welcome message to the sign-in page. - [Operations](operations/README.md) Keeping GitLab up and running
- [Issue closing](customization/issue_closing.md) Customize how to close an issue from commit messages. - [Raketasks](raketasks/README.md) Backups, maintenance, automatic web hook setup and the importing of projects.
- [Libravatar](customization/libravatar.md) Use Libravatar for user avatars. - [Security](security/README.md) Learn what you can do to further secure your GitLab instance.
- [Operations](operations/README.md) Keeping GitLab up and running - [System hooks](system_hooks/system_hooks.md) Notifications when users, projects and keys are changed.
- [Log system](logs/logs.md) Log system - [Update](update/README.md) Update guides to upgrade your installation.
- [Welcome message](customization/welcome_message.md) Add a custom welcome message to the sign-in page.
## Contributor documentation
## Contributor documentation
- [Development](development/README.md) Explains the architecture and the guidelines for shell commands.
- [Legal](legal/README.md) Contributor license agreements. - [Development](development/README.md) Explains the architecture and the guidelines for shell commands.
- [Release](release/README.md) How to make the monthly and security releases. - [Legal](legal/README.md) Contributor license agreements.
- [Release](release/README.md) How to make the monthly and security releases.
\ No newline at end of file
# Workflow # Workflow
- [Feature branch workflow](workflow.md) - [Authorization for merge requests](authorization_for_merge_requests.md)
- [Project forking workflow](forking_workflow.md) - [Change your time zone](timezone.md)
- [Project Features](project_features.md) - [Feature branch workflow](workflow.md)
- [Authorization for merge requests](authorization_for_merge_requests.md) - [GitLab Flow](gitlab_flow.md)
- [Groups](groups.md) - [Groups](groups.md)
- [Labels](labels.md) - [Keyboard shortcuts](shortcuts.md)
- [GitLab Flow](gitlab_flow.md) - [Labels](labels.md)
- [Notifications](notifications.md) - [Notifications](notifications.md)
- [Importing to GitLab](doc/importing/README.md) - [Project Features](project_features.md)
- [Two-factor Authentication (2FA)](two_factor_authentication.md) - [Project forking workflow](forking_workflow.md)
- [Protected branches](protected_branches.md) - [Protected branches](protected_branches.md)
- [Change your time zone](timezone.md) - [Two-factor Authentication (2FA)](two_factor_authentication.md)
- [Keyboard shortcuts](shortcuts.md) - [Web Editor](web_editor.md)
- [Web Editor](web_editor.md) - ["Work In Progress" Merge Requests](wip_merge_requests.md)
- ["Work In Progress" Merge Requests](wip_merge_requests.md) \ No newline at end of file
# Import your project from Bitbucket to GitLab # 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). 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 * Sign in to GitLab.com and go to your dashboard
2. Click on "New project" * Click on "New project"
![New project in GitLab](bitbucket_importer/bitbucket_import_new_project.jpg) ![New project in GitLab](bitbucket_importer/bitbucket_import_new_project.jpg)
3. Click on the "Bitbucket" button * Click on the "Bitbucket" button
![Bitbucket](bitbucket_importer/bitbucket_import_select_bitbucket.jpg) ![Bitbucket](bitbucket_importer/bitbucket_import_select_bitbucket.jpg)
4. Grant GitLab access to your Bitbucket account * Grant GitLab access to your Bitbucket account
![Grant access](bitbucket_importer/bitbucket_import_grant_access.jpg) ![Grant access](bitbucket_importer/bitbucket_import_grant_access.jpg)
5. Click on the projects that you'd like to import or "Import all projects" * Click on the projects that you'd like to import or "Import all projects"
![Import projects](bitbucket_importer/bitbucket_import_select_project.png) ![Import projects](bitbucket_importer/bitbucket_import_select_project.png)
A new GitLab project will be created with your imported data. A new GitLab project will be created with your imported data.
### Note
Milestones and wiki pages are not imported from Bitbucket.
\ No newline at end of file
# Import your project from GitHub to GitLab # Import your project from GitHub to GitLab
It takes just a couple of steps to import your existing GitHub projects to GitLab. 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) GitHub support is enabled on your GitLab instance. You can read more about GitHub support [here](http://doc.gitlab.com/ce/integration/github.html)
1. Sign in to GitLab.com and go to your dashboard. * 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. * To get to the importer page, you need to go to the "New project" page.
![New project page](github_importer/new_project_page.png) ![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. * 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) ![Importer page](github_importer/importer.png)
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. * 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 ### 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. 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.
\ No newline at end of file
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