From 9a4886f0a0cde067dcc33bb4aa11ebbdd78cfeba Mon Sep 17 00:00:00 2001 From: Job van der Voort Date: Thu, 11 Jun 2015 14:45:48 +0200 Subject: move and fix links importing docs --- .../bitbucket_import_grant_access.jpg | Bin 68856 -> 0 bytes .../bitbucket_import_new_project.jpg | Bin 24581 -> 0 bytes .../bitbucket_import_select_bitbucket.jpg | Bin 90035 -> 0 bytes .../bitbucket_import_select_project.png | Bin 62463 -> 0 bytes doc/workflow/github_importer/importer.png | Bin 39335 -> 0 bytes doc/workflow/github_importer/new_project_page.png | Bin 46276 -> 0 bytes doc/workflow/gitlab_importer/importer.png | Bin 40778 -> 0 bytes doc/workflow/gitlab_importer/new_project_page.png | Bin 72663 -> 0 bytes doc/workflow/import_projects_from_bitbucket.md | 26 --------------------- doc/workflow/import_projects_from_github.md | 18 -------------- doc/workflow/import_projects_from_gitlab_com.md | 18 -------------- doc/workflow/importing/README.md | 8 +++---- .../bitbucket_import_grant_access.jpg | Bin 0 -> 68856 bytes .../bitbucket_import_new_project.jpg | Bin 0 -> 24581 bytes .../bitbucket_import_select_bitbucket.jpg | Bin 0 -> 90035 bytes .../bitbucket_import_select_project.png | Bin 0 -> 62463 bytes .../importing/github_importer/importer.png | Bin 0 -> 39335 bytes .../importing/github_importer/new_project_page.png | Bin 0 -> 46276 bytes .../importing/gitlab_importer/importer.png | Bin 0 -> 40778 bytes .../importing/gitlab_importer/new_project_page.png | Bin 0 -> 72663 bytes .../importing/import_projects_from_bitbucket.md | 26 +++++++++++++++++++++ .../importing/import_projects_from_github.md | 18 ++++++++++++++ .../importing/import_projects_from_gitlab_com.md | 18 ++++++++++++++ doc/workflow/importing/migrating_from_svn.md | 17 ++++++++++++++ doc/workflow/migrating_from_svn.md | 17 -------------- 25 files changed, 83 insertions(+), 83 deletions(-) delete mode 100644 doc/workflow/bitbucket_importer/bitbucket_import_grant_access.jpg delete mode 100644 doc/workflow/bitbucket_importer/bitbucket_import_new_project.jpg delete mode 100644 doc/workflow/bitbucket_importer/bitbucket_import_select_bitbucket.jpg delete mode 100644 doc/workflow/bitbucket_importer/bitbucket_import_select_project.png delete mode 100644 doc/workflow/github_importer/importer.png delete mode 100644 doc/workflow/github_importer/new_project_page.png delete mode 100644 doc/workflow/gitlab_importer/importer.png delete mode 100644 doc/workflow/gitlab_importer/new_project_page.png delete mode 100644 doc/workflow/import_projects_from_bitbucket.md delete mode 100644 doc/workflow/import_projects_from_github.md delete mode 100644 doc/workflow/import_projects_from_gitlab_com.md create mode 100644 doc/workflow/importing/bitbucket_importer/bitbucket_import_grant_access.jpg create mode 100644 doc/workflow/importing/bitbucket_importer/bitbucket_import_new_project.jpg create mode 100644 doc/workflow/importing/bitbucket_importer/bitbucket_import_select_bitbucket.jpg create mode 100644 doc/workflow/importing/bitbucket_importer/bitbucket_import_select_project.png create mode 100644 doc/workflow/importing/github_importer/importer.png create mode 100644 doc/workflow/importing/github_importer/new_project_page.png create mode 100644 doc/workflow/importing/gitlab_importer/importer.png create mode 100644 doc/workflow/importing/gitlab_importer/new_project_page.png create mode 100644 doc/workflow/importing/import_projects_from_bitbucket.md create mode 100644 doc/workflow/importing/import_projects_from_github.md create mode 100644 doc/workflow/importing/import_projects_from_gitlab_com.md create mode 100644 doc/workflow/importing/migrating_from_svn.md delete mode 100644 doc/workflow/migrating_from_svn.md (limited to 'doc/workflow') diff --git a/doc/workflow/bitbucket_importer/bitbucket_import_grant_access.jpg b/doc/workflow/bitbucket_importer/bitbucket_import_grant_access.jpg deleted file mode 100644 index f3432e923c4..00000000000 Binary files a/doc/workflow/bitbucket_importer/bitbucket_import_grant_access.jpg and /dev/null differ diff --git a/doc/workflow/bitbucket_importer/bitbucket_import_new_project.jpg b/doc/workflow/bitbucket_importer/bitbucket_import_new_project.jpg deleted file mode 100644 index d0befa430b5..00000000000 Binary files a/doc/workflow/bitbucket_importer/bitbucket_import_new_project.jpg and /dev/null differ diff --git a/doc/workflow/bitbucket_importer/bitbucket_import_select_bitbucket.jpg b/doc/workflow/bitbucket_importer/bitbucket_import_select_bitbucket.jpg deleted file mode 100644 index 53080e8104d..00000000000 Binary files a/doc/workflow/bitbucket_importer/bitbucket_import_select_bitbucket.jpg and /dev/null differ diff --git a/doc/workflow/bitbucket_importer/bitbucket_import_select_project.png b/doc/workflow/bitbucket_importer/bitbucket_import_select_project.png deleted file mode 100644 index 8312825eb18..00000000000 Binary files a/doc/workflow/bitbucket_importer/bitbucket_import_select_project.png and /dev/null differ diff --git a/doc/workflow/github_importer/importer.png b/doc/workflow/github_importer/importer.png deleted file mode 100644 index 57636717571..00000000000 Binary files a/doc/workflow/github_importer/importer.png and /dev/null differ diff --git a/doc/workflow/github_importer/new_project_page.png b/doc/workflow/github_importer/new_project_page.png deleted file mode 100644 index 002f22d81d7..00000000000 Binary files a/doc/workflow/github_importer/new_project_page.png and /dev/null differ diff --git a/doc/workflow/gitlab_importer/importer.png b/doc/workflow/gitlab_importer/importer.png deleted file mode 100644 index d2a286d8cac..00000000000 Binary files a/doc/workflow/gitlab_importer/importer.png and /dev/null differ diff --git a/doc/workflow/gitlab_importer/new_project_page.png b/doc/workflow/gitlab_importer/new_project_page.png deleted file mode 100644 index 5e239208e1e..00000000000 Binary files a/doc/workflow/gitlab_importer/new_project_page.png and /dev/null differ diff --git a/doc/workflow/import_projects_from_bitbucket.md b/doc/workflow/import_projects_from_bitbucket.md deleted file mode 100644 index 20d65f1925a..00000000000 --- a/doc/workflow/import_projects_from_bitbucket.md +++ /dev/null @@ -1,26 +0,0 @@ -# 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). - -* Sign in to GitLab.com and go to your dashboard - -* Click on "New project" - -![New project in GitLab](bitbucket_importer/bitbucket_import_new_project.jpg) - -* Click on the "Bitbucket" button - -![Bitbucket](bitbucket_importer/bitbucket_import_select_bitbucket.jpg) - -* Grant GitLab access to your Bitbucket account - -![Grant access](bitbucket_importer/bitbucket_import_grant_access.jpg) - -* 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 diff --git a/doc/workflow/import_projects_from_github.md b/doc/workflow/import_projects_from_github.md deleted file mode 100644 index aad2c63817d..00000000000 --- a/doc/workflow/import_projects_from_github.md +++ /dev/null @@ -1,18 +0,0 @@ -# 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 diff --git a/doc/workflow/import_projects_from_gitlab_com.md b/doc/workflow/import_projects_from_gitlab_com.md deleted file mode 100644 index f4c4e955d46..00000000000 --- a/doc/workflow/import_projects_from_gitlab_com.md +++ /dev/null @@ -1,18 +0,0 @@ -# Project importing from GitLab.com to your private GitLab instance - -You can import your existing GitLab.com projects to your GitLab instance. But keep in mind that it is possible only if -GitLab support is enabled on your GitLab instance. -You can read more about Gitlab support [here](http://doc.gitlab.com/ce/integration/gitlab.html) -To get to the importer page you need to go to "New project" page. - -![New project page](gitlab_importer/new_project_page.png) - -Click on the "Import projects from Gitlab.com" link and you will be redirected to GitLab.com -for permission to access your projects. After accepting, you'll be automatically redirected to the importer. - - -![Importer page](gitlab_importer/importer.png) - - -To import a project, you can simple click "Import". 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 diff --git a/doc/workflow/importing/README.md b/doc/workflow/importing/README.md index 86a8a625453..2b2e9037425 100644 --- a/doc/workflow/importing/README.md +++ b/doc/workflow/importing/README.md @@ -1,6 +1,6 @@ # Migrating projects to a GitLab instance -1. [Bitbucket](workflow/import_projects_from_bitbucket.md) -2. [GitHub](workflow/import_projects_from_github.md) -3. [GitLab.com](workflow/import_projects_from_gitlab_com.md) -4. [SVN](workflow/migrating_from_svn.md) \ No newline at end of file +1. [Bitbucket](import_projects_from_bitbucket.md) +2. [GitHub](import_projects_from_github.md) +3. [GitLab.com](import_projects_from_gitlab_com.md) +4. [SVN](migrating_from_svn.md) diff --git a/doc/workflow/importing/bitbucket_importer/bitbucket_import_grant_access.jpg b/doc/workflow/importing/bitbucket_importer/bitbucket_import_grant_access.jpg new file mode 100644 index 00000000000..f3432e923c4 Binary files /dev/null and b/doc/workflow/importing/bitbucket_importer/bitbucket_import_grant_access.jpg differ diff --git a/doc/workflow/importing/bitbucket_importer/bitbucket_import_new_project.jpg b/doc/workflow/importing/bitbucket_importer/bitbucket_import_new_project.jpg new file mode 100644 index 00000000000..d0befa430b5 Binary files /dev/null and b/doc/workflow/importing/bitbucket_importer/bitbucket_import_new_project.jpg differ diff --git a/doc/workflow/importing/bitbucket_importer/bitbucket_import_select_bitbucket.jpg b/doc/workflow/importing/bitbucket_importer/bitbucket_import_select_bitbucket.jpg new file mode 100644 index 00000000000..53080e8104d Binary files /dev/null and b/doc/workflow/importing/bitbucket_importer/bitbucket_import_select_bitbucket.jpg differ diff --git a/doc/workflow/importing/bitbucket_importer/bitbucket_import_select_project.png b/doc/workflow/importing/bitbucket_importer/bitbucket_import_select_project.png new file mode 100644 index 00000000000..8312825eb18 Binary files /dev/null and b/doc/workflow/importing/bitbucket_importer/bitbucket_import_select_project.png differ diff --git a/doc/workflow/importing/github_importer/importer.png b/doc/workflow/importing/github_importer/importer.png new file mode 100644 index 00000000000..57636717571 Binary files /dev/null and b/doc/workflow/importing/github_importer/importer.png differ diff --git a/doc/workflow/importing/github_importer/new_project_page.png b/doc/workflow/importing/github_importer/new_project_page.png new file mode 100644 index 00000000000..002f22d81d7 Binary files /dev/null and b/doc/workflow/importing/github_importer/new_project_page.png differ diff --git a/doc/workflow/importing/gitlab_importer/importer.png b/doc/workflow/importing/gitlab_importer/importer.png new file mode 100644 index 00000000000..d2a286d8cac Binary files /dev/null and b/doc/workflow/importing/gitlab_importer/importer.png differ diff --git a/doc/workflow/importing/gitlab_importer/new_project_page.png b/doc/workflow/importing/gitlab_importer/new_project_page.png new file mode 100644 index 00000000000..5e239208e1e Binary files /dev/null and b/doc/workflow/importing/gitlab_importer/new_project_page.png differ diff --git a/doc/workflow/importing/import_projects_from_bitbucket.md b/doc/workflow/importing/import_projects_from_bitbucket.md new file mode 100644 index 00000000000..20d65f1925a --- /dev/null +++ b/doc/workflow/importing/import_projects_from_bitbucket.md @@ -0,0 +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). + +* Sign in to GitLab.com and go to your dashboard + +* Click on "New project" + +![New project in GitLab](bitbucket_importer/bitbucket_import_new_project.jpg) + +* Click on the "Bitbucket" button + +![Bitbucket](bitbucket_importer/bitbucket_import_select_bitbucket.jpg) + +* Grant GitLab access to your Bitbucket account + +![Grant access](bitbucket_importer/bitbucket_import_grant_access.jpg) + +* 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 diff --git a/doc/workflow/importing/import_projects_from_github.md b/doc/workflow/importing/import_projects_from_github.md new file mode 100644 index 00000000000..aad2c63817d --- /dev/null +++ b/doc/workflow/importing/import_projects_from_github.md @@ -0,0 +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) + +* 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 diff --git a/doc/workflow/importing/import_projects_from_gitlab_com.md b/doc/workflow/importing/import_projects_from_gitlab_com.md new file mode 100644 index 00000000000..f4c4e955d46 --- /dev/null +++ b/doc/workflow/importing/import_projects_from_gitlab_com.md @@ -0,0 +1,18 @@ +# Project importing from GitLab.com to your private GitLab instance + +You can import your existing GitLab.com projects to your GitLab instance. But keep in mind that it is possible only if +GitLab support is enabled on your GitLab instance. +You can read more about Gitlab support [here](http://doc.gitlab.com/ce/integration/gitlab.html) +To get to the importer page you need to go to "New project" page. + +![New project page](gitlab_importer/new_project_page.png) + +Click on the "Import projects from Gitlab.com" link and you will be redirected to GitLab.com +for permission to access your projects. After accepting, you'll be automatically redirected to the importer. + + +![Importer page](gitlab_importer/importer.png) + + +To import a project, you can simple click "Import". 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 diff --git a/doc/workflow/importing/migrating_from_svn.md b/doc/workflow/importing/migrating_from_svn.md new file mode 100644 index 00000000000..485db4834e9 --- /dev/null +++ b/doc/workflow/importing/migrating_from_svn.md @@ -0,0 +1,17 @@ +# Migrating from SVN to GitLab + +SVN stands for Subversion and is a version control system (VCS). +Git is a distributed version control system. + +There are some major differences between the two, for more information consult your favorite search engine. + +Git has tools for migrating SVN repositories to git, namely `git svn`. You can read more about this at +[git documentation pages](http://git-scm.com/book/en/Git-and-Other-Systems-Git-and-Subversion). + +Apart from the [official git documentation](http://git-scm.com/book/en/Git-and-Other-Systems-Migrating-to-Git) there is also +user created step by step guide for migrating from SVN to GitLab. + +[Benjamin New](https://github.com/leftclickben) wrote [a guide that shows how to do a migration](https://gist.github.com/leftclickben/322b7a3042cbe97ed2af). Mirrors can be found [here](https://gitlab.com/snippets/2168) and [here](https://gist.github.com/maxlazio/f1b593b0d00aa966e9ca). + +## Contribute to this guide +We welcome all contributions that would expand this guide with instructions on how to migrate from SVN and other version control systems. diff --git a/doc/workflow/migrating_from_svn.md b/doc/workflow/migrating_from_svn.md deleted file mode 100644 index 485db4834e9..00000000000 --- a/doc/workflow/migrating_from_svn.md +++ /dev/null @@ -1,17 +0,0 @@ -# Migrating from SVN to GitLab - -SVN stands for Subversion and is a version control system (VCS). -Git is a distributed version control system. - -There are some major differences between the two, for more information consult your favorite search engine. - -Git has tools for migrating SVN repositories to git, namely `git svn`. You can read more about this at -[git documentation pages](http://git-scm.com/book/en/Git-and-Other-Systems-Git-and-Subversion). - -Apart from the [official git documentation](http://git-scm.com/book/en/Git-and-Other-Systems-Migrating-to-Git) there is also -user created step by step guide for migrating from SVN to GitLab. - -[Benjamin New](https://github.com/leftclickben) wrote [a guide that shows how to do a migration](https://gist.github.com/leftclickben/322b7a3042cbe97ed2af). Mirrors can be found [here](https://gitlab.com/snippets/2168) and [here](https://gist.github.com/maxlazio/f1b593b0d00aa966e9ca). - -## Contribute to this guide -We welcome all contributions that would expand this guide with instructions on how to migrate from SVN and other version control systems. -- cgit v1.2.1