From ce7831ae39438d324aea4ef1d955e7901fdbedbc Mon Sep 17 00:00:00 2001 From: Karen Carias Date: Mon, 8 Jun 2015 20:26:58 +0000 Subject: fixed importing link --- doc/workflow/README.md | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/doc/workflow/README.md b/doc/workflow/README.md index 809b8d16abc..dee79693112 100644 --- a/doc/workflow/README.md +++ b/doc/workflow/README.md @@ -1,17 +1,17 @@ -# Workflow - -- [Feature branch workflow](workflow.md) -- [Project forking workflow](forking_workflow.md) -- [Project Features](project_features.md) -- [Authorization for merge requests](authorization_for_merge_requests.md) -- [Groups](groups.md) -- [Labels](labels.md) -- [GitLab Flow](gitlab_flow.md) -- [Notifications](notifications.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) -- [Keyboard shortcuts](shortcuts.md) -- [Web Editor](web_editor.md) -- ["Work In Progress" Merge Requests](wip_merge_requests.md) +# Workflow + +- [Feature branch workflow](workflow.md) +- [Project forking workflow](forking_workflow.md) +- [Project Features](project_features.md) +- [Authorization for merge requests](authorization_for_merge_requests.md) +- [Groups](groups.md) +- [Labels](labels.md) +- [GitLab Flow](gitlab_flow.md) +- [Notifications](notifications.md) +- [Importing to GitLab](importing/README.md) +- [Two-factor Authentication (2FA)](two_factor_authentication.md) +- [Protected branches](protected_branches.md) +- [Change your time zone](timezone.md) +- [Keyboard shortcuts](shortcuts.md) +- [Web Editor](web_editor.md) +- ["Work In Progress" Merge Requests](wip_merge_requests.md) \ No newline at end of file -- cgit v1.2.1 From e150ab9cee64a596297b307739fc7e0a4bc55ae7 Mon Sep 17 00:00:00 2001 From: Karen Carias Date: Mon, 8 Jun 2015 20:31:02 +0000 Subject: Added info about milestones and wiki pages not imported from Bitbucket --- doc/workflow/import_projects_from_bitbucket.md | 49 ++++++++++++++------------ 1 file changed, 26 insertions(+), 23 deletions(-) diff --git a/doc/workflow/import_projects_from_bitbucket.md b/doc/workflow/import_projects_from_bitbucket.md index 341b1a5f86c..31e84a722e4 100644 --- a/doc/workflow/import_projects_from_bitbucket.md +++ b/doc/workflow/import_projects_from_bitbucket.md @@ -1,23 +1,26 @@ -# 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. +# 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. + +### Note +Milestones and wiki pages are not imported from Bitbucket. \ No newline at end of file -- cgit v1.2.1 From fc9d90c3796069ed87bd5a316d7f598b49b01ed1 Mon Sep 17 00:00:00 2001 From: Karen Carias Date: Mon, 8 Jun 2015 20:35:53 +0000 Subject: fixed numbers --- doc/workflow/import_projects_from_bitbucket.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/workflow/import_projects_from_bitbucket.md b/doc/workflow/import_projects_from_bitbucket.md index 31e84a722e4..bca97210725 100644 --- a/doc/workflow/import_projects_from_bitbucket.md +++ b/doc/workflow/import_projects_from_bitbucket.md @@ -4,19 +4,19 @@ It takes just a few steps to import your existing Bitbucket projects to GitLab. 1. Sign in to GitLab.com and go to your dashboard -2. Click on "New project" +1. Click on "New project" ![New project in GitLab](bitbucket_importer/bitbucket_import_new_project.jpg) -3. Click on the "Bitbucket" button +1. Click on the "Bitbucket" button ![Bitbucket](bitbucket_importer/bitbucket_import_select_bitbucket.jpg) -4. Grant GitLab access to your Bitbucket account +1. 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" +1. Click on the projects that you'd like to import or "Import all projects" ![Import projects](bitbucket_importer/bitbucket_import_select_project.png) -- cgit v1.2.1 From 0c538cd8b567d822b94ddbb73c035e0b2201c226 Mon Sep 17 00:00:00 2001 From: Karen Carias Date: Mon, 8 Jun 2015 20:36:28 +0000 Subject: fixed numbers --- doc/workflow/import_projects_from_bitbucket.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/workflow/import_projects_from_bitbucket.md b/doc/workflow/import_projects_from_bitbucket.md index bca97210725..20d65f1925a 100644 --- a/doc/workflow/import_projects_from_bitbucket.md +++ b/doc/workflow/import_projects_from_bitbucket.md @@ -2,21 +2,21 @@ 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 -1. Click on "New project" +* Click on "New project" ![New project in GitLab](bitbucket_importer/bitbucket_import_new_project.jpg) -1. Click on the "Bitbucket" button +* Click on the "Bitbucket" button ![Bitbucket](bitbucket_importer/bitbucket_import_select_bitbucket.jpg) -1. Grant GitLab access to your Bitbucket account +* Grant GitLab access to your Bitbucket account ![Grant access](bitbucket_importer/bitbucket_import_grant_access.jpg) -1. 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) -- cgit v1.2.1 From 44aaf40ad348b7c8406a997db9bf88e406d8766c Mon Sep 17 00:00:00 2001 From: Karen Carias Date: Mon, 8 Jun 2015 20:37:28 +0000 Subject: fixed numbers --- doc/workflow/import_projects_from_github.md | 36 ++++++++++++++--------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/doc/workflow/import_projects_from_github.md b/doc/workflow/import_projects_from_github.md index c04906034c0..aad2c63817d 100644 --- a/doc/workflow/import_projects_from_github.md +++ b/doc/workflow/import_projects_from_github.md @@ -1,18 +1,18 @@ -# 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 -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. -2. To get to the importer page, you need to go to the "New project" page. - -![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) - -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. +# 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 +GitHub support is enabled on your GitLab instance. You can read more about GitHub support [here](http://doc.gitlab.com/ce/integration/github.html) + +* Sign in to GitLab.com and go to your dashboard. +* To get to the importer page, you need to go to the "New project" page. + +![New project page](github_importer/new_project_page.png) + +* 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. + +### 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. \ No newline at end of file -- cgit v1.2.1 From 0ea9c962a4af3916f732f48f4d658f0328150784 Mon Sep 17 00:00:00 2001 From: Karen Carias Date: Mon, 8 Jun 2015 20:48:06 +0000 Subject: added link to "importing to GitLab". Also organized docs in alphabetical order. --- doc/README.md | 69 ++++++++++++++++++++++++++++++----------------------------- 1 file changed, 35 insertions(+), 34 deletions(-) diff --git a/doc/README.md b/doc/README.md index 4e00dceac2b..654b3de712a 100644 --- a/doc/README.md +++ b/doc/README.md @@ -1,34 +1,35 @@ -# Documentation - -## User documentation - -- [API](api/README.md) Automate GitLab via a simple and powerful API. -- [Markdown](markdown/markdown.md) GitLab's advanced formatting system. -- [Permissions](permissions/permissions.md) Learn what each role in a project (guest/reporter/developer/master/owner) can do. -- [Project Services](project_services/project_services.md) Integrate a project with external services, such as CI and chat. -- [Public access](public_access/public_access.md) Learn how you can allow public and internal access to projects. -- [SSH](ssh/README.md) Setup your ssh keys and deploy keys for secure access to your projects. -- [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. -- [GitLab as OAuth2 authentication service provider](integration/oauth_provider.md). It allows you to login to other applications from GitLab. - -## 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. -- [Raketasks](raketasks/README.md) Backups, maintenance, automatic web hook setup and the importing of projects. -- [Custom git hooks](hooks/custom_hooks.md) Custom git hooks (on the filesystem) for when web hooks aren't enough. -- [System hooks](system_hooks/system_hooks.md) Notifications when users, projects and keys are changed. -- [Security](security/README.md) Learn what you can do to further secure your GitLab instance. -- [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. -- [Issue closing](customization/issue_closing.md) Customize how to close an issue from commit messages. -- [Libravatar](customization/libravatar.md) Use Libravatar for user avatars. -- [Operations](operations/README.md) Keeping GitLab up and running -- [Log system](logs/logs.md) Log system - -## Contributor documentation - -- [Development](development/README.md) Explains the architecture and the guidelines for shell commands. -- [Legal](legal/README.md) Contributor license agreements. -- [Release](release/README.md) How to make the monthly and security releases. +# Documentation + +## User documentation + +- [API](api/README.md) Automate GitLab via a simple and powerful API. +- [GitLab as OAuth2 authentication service provider](integration/oauth_provider.md). It allows you to login to other applications from GitLab. +- [Importing to GitLab](doc/importing/README.md). +- [Markdown](markdown/markdown.md) GitLab's advanced formatting system. +- [Permissions](permissions/permissions.md) Learn what each role in a project (guest/reporter/developer/master/owner) can do. +- [Project Services](project_services/project_services.md) Integrate a project with external services, such as CI and chat. +- [Public access](public_access/public_access.md) Learn how you can allow public and internal access to projects. +- [SSH](ssh/README.md) Setup your ssh keys and deploy keys for secure access to your projects. +- [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 + +- [Custom git hooks](hooks/custom_hooks.md) Custom git hooks (on the filesystem) for when web hooks aren't enough. +- [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. +- [Issue closing](customization/issue_closing.md) Customize how to close an issue from commit messages. +- [Libravatar](customization/libravatar.md) Use Libravatar for user avatars. +- [Log system](logs/logs.md) Log system. +- [Operations](operations/README.md) Keeping GitLab up and running +- [Raketasks](raketasks/README.md) Backups, maintenance, automatic web hook setup and the importing of projects. +- [Security](security/README.md) Learn what you can do to further secure your GitLab instance. +- [System hooks](system_hooks/system_hooks.md) Notifications when users, projects and keys are changed. +- [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 + +- [Development](development/README.md) Explains the architecture and the guidelines for shell commands. +- [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 -- cgit v1.2.1 From b4116e76cb46921f5791a9c783b671c07b424a5e Mon Sep 17 00:00:00 2001 From: Karen Carias Date: Mon, 8 Jun 2015 20:55:42 +0000 Subject: Removed link "importing to gitlab" because it's in "Documentation". Organized links in alphabetical order. --- doc/workflow/README.md | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/doc/workflow/README.md b/doc/workflow/README.md index dee79693112..70a8179c8eb 100644 --- a/doc/workflow/README.md +++ b/doc/workflow/README.md @@ -1,17 +1,16 @@ # Workflow -- [Feature branch workflow](workflow.md) -- [Project forking workflow](forking_workflow.md) -- [Project Features](project_features.md) - [Authorization for merge requests](authorization_for_merge_requests.md) +- [Change your time zone](timezone.md) +- [Feature branch workflow](workflow.md) +- [GitLab Flow](gitlab_flow.md) - [Groups](groups.md) +- [Keyboard shortcuts](shortcuts.md) - [Labels](labels.md) -- [GitLab Flow](gitlab_flow.md) - [Notifications](notifications.md) -- [Importing to GitLab](importing/README.md) -- [Two-factor Authentication (2FA)](two_factor_authentication.md) +- [Project Features](project_features.md) +- [Project forking workflow](forking_workflow.md) - [Protected branches](protected_branches.md) -- [Change your time zone](timezone.md) -- [Keyboard shortcuts](shortcuts.md) +- [Two-factor Authentication (2FA)](two_factor_authentication.md) - [Web Editor](web_editor.md) - ["Work In Progress" Merge Requests](wip_merge_requests.md) \ No newline at end of file -- cgit v1.2.1 From 60ac9253ada98f53bb17305dbe4c3168e1bbb219 Mon Sep 17 00:00:00 2001 From: Karen Carias Date: Mon, 8 Jun 2015 21:01:56 +0000 Subject: fixed link --- doc/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/README.md b/doc/README.md index 654b3de712a..bd44aec11bc 100644 --- a/doc/README.md +++ b/doc/README.md @@ -4,7 +4,7 @@ - [API](api/README.md) Automate GitLab via a simple and powerful API. - [GitLab as OAuth2 authentication service provider](integration/oauth_provider.md). It allows you to login to other applications from GitLab. -- [Importing to GitLab](doc/importing/README.md). +- [Importing to GitLab](importing/README.md). - [Markdown](markdown/markdown.md) GitLab's advanced formatting system. - [Permissions](permissions/permissions.md) Learn what each role in a project (guest/reporter/developer/master/owner) can do. - [Project Services](project_services/project_services.md) Integrate a project with external services, such as CI and chat. -- cgit v1.2.1 -- cgit v1.2.1 From ed42be4019f2640b1a66fff487c6581a0df3bffd Mon Sep 17 00:00:00 2001 From: Karen Carias Date: Mon, 8 Jun 2015 21:03:57 +0000 Subject: fixed link --- doc/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/README.md b/doc/README.md index bd44aec11bc..7a2181edded 100644 --- a/doc/README.md +++ b/doc/README.md @@ -4,7 +4,7 @@ - [API](api/README.md) Automate GitLab via a simple and powerful API. - [GitLab as OAuth2 authentication service provider](integration/oauth_provider.md). It allows you to login to other applications from GitLab. -- [Importing to GitLab](importing/README.md). +- [Importing to GitLab](workflow/importing/README.md). - [Markdown](markdown/markdown.md) GitLab's advanced formatting system. - [Permissions](permissions/permissions.md) Learn what each role in a project (guest/reporter/developer/master/owner) can do. - [Project Services](project_services/project_services.md) Integrate a project with external services, such as CI and chat. -- cgit v1.2.1