summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-04-22 08:36:37 +0000
committerYorick Peterse <yorickpeterse@gmail.com>2016-04-22 10:57:04 +0200
commitc291e9b5531db0585d12d6ff59c46eae0c2306f0 (patch)
treeff83df0d9ae454233cf7ec2a2cbd36a04e81ac05
parentc465c90068d41e95c4f5caa825902a3b55578a3a (diff)
downloadgitlab-ce-c291e9b5531db0585d12d6ff59c46eae0c2306f0.tar.gz
Merge branch 'doc-gh-import-additions' into 'master'
Add newest enhancements to GH importer docs [ci skip] See merge request !3867
-rw-r--r--doc/workflow/importing/import_projects_from_github.md14
1 files changed, 9 insertions, 5 deletions
diff --git a/doc/workflow/importing/import_projects_from_github.md b/doc/workflow/importing/import_projects_from_github.md
index f693f430a42..e670e415c71 100644
--- a/doc/workflow/importing/import_projects_from_github.md
+++ b/doc/workflow/importing/import_projects_from_github.md
@@ -1,7 +1,8 @@
# Import your project from GitHub to GitLab
-_**Note:** In order to enable the GitHub import setting, you should first
-enable the [GitHub integration][gh-import] in your GitLab instance._
+>**Note:**
+In order to enable the GitHub import setting, you should first
+enable the [GitHub integration][gh-import] in your GitLab instance.
At its current state, GitHub importer can import:
@@ -10,10 +11,13 @@ At its current state, GitHub importer can import:
- the issues (introduced in GitLab 7.7)
- the pull requests (introduced in GitLab 8.4)
- the wiki pages (introduced in GitLab 8.4)
+- the milestones (introduced in GitLab 8.7)
+- the labels (introduced in GitLab 8.7)
-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.
+With GitLab 8.7+, references to pull requests and issues are preserved.
+
+It is not yet possible to import your 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