From 3fbd2b696440d3c421fc4477141615ce354d14cd Mon Sep 17 00:00:00 2001 From: Achilleas Pipinellis Date: Fri, 15 Jan 2016 23:40:11 +0100 Subject: [PATCH 1/2] Add the version each feature was introduced and remove note --- .../importing/import_projects_from_github.md | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/doc/workflow/importing/import_projects_from_github.md b/doc/workflow/importing/import_projects_from_github.md index 77fb7ea7cd6..694521ff490 100644 --- a/doc/workflow/importing/import_projects_from_github.md +++ b/doc/workflow/importing/import_projects_from_github.md @@ -5,11 +5,14 @@ enable the [GitHub integration][gh-import] in your GitLab instance._ At its current state, GitHub importer can import: -- the repository description -- the git repository data -- the issues -- the pull requests -- the wiki pages +- the repository description (introduced in GitLab 7.7) +- the git repository data (introduced in GitLab 7.7) +- the issues (introduced in GitLab 7.7) +- the pull requests (introduced in GitLab 8.4) +- the wiki pages (introduced in GitLab 8.4) + +It is not yet possible to import your labels and milestones. We are working on +improving this in the near future. The importer page is visible when you [create a new project][new-project]. Click on the **GitHub** link and you will be redirected to GitHub for @@ -35,12 +38,6 @@ The importer will create any new namespaces if they don't exist or in the case the namespace is taken, the project will be imported on the user's namespace. -### Note - -When you import your projects from GitHub, it is not possible to keep your -labels, milestones, and cross-repository pull requests. We are working on -improving this in the near future. - [gh-import]: ../../integration/github.md "GitHub integration" [ee-gh]: http://doc.gitlab.com/ee/integration/github.html "GitHub integration for GitLab EE" [new-project]: ../../gitlab-basics/create-project.md "How to create a new project in GitLab" From ed969aabddef5fd5911f3704f1843092025b98ec Mon Sep 17 00:00:00 2001 From: Achilleas Pipinellis Date: Sat, 16 Jan 2016 10:55:44 +0100 Subject: [PATCH 2/2] Importing GitHub cross-repository PRs is not supported atm [ci skip] --- doc/workflow/importing/import_projects_from_github.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/workflow/importing/import_projects_from_github.md b/doc/workflow/importing/import_projects_from_github.md index 694521ff490..f693f430a42 100644 --- a/doc/workflow/importing/import_projects_from_github.md +++ b/doc/workflow/importing/import_projects_from_github.md @@ -11,8 +11,9 @@ At its current state, GitHub importer can import: - the pull requests (introduced in GitLab 8.4) - the wiki pages (introduced in GitLab 8.4) -It is not yet possible to import your labels and milestones. We are working on -improving this in the near future. +It is not yet possible to import your labels, milestones and cross-repository +pull requests (those from forks). We are working on improving this in the near +future. The importer page is visible when you [create a new project][new-project]. Click on the **GitHub** link and you will be redirected to GitHub for