From 5bf01bb7b993250ad24ebcc313eea1cf32c6908b Mon Sep 17 00:00:00 2001 From: Lee Matos Date: Tue, 13 Dec 2016 20:05:46 +0000 Subject: [PATCH 1/3] Clarify instructions for importing Wiki/Merge Request data --- doc/workflow/importing/import_projects_from_gitlab_com.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/workflow/importing/import_projects_from_gitlab_com.md b/doc/workflow/importing/import_projects_from_gitlab_com.md index dcc00074b75..ae4e92bd7cd 100644 --- a/doc/workflow/importing/import_projects_from_gitlab_com.md +++ b/doc/workflow/importing/import_projects_from_gitlab_com.md @@ -5,6 +5,8 @@ GitLab support is enabled on your GitLab instance. You can read more about GitLab support [here](http://docs.gitlab.com/ce/integration/gitlab.html) To get to the importer page you need to go to "New project" page. +Note: If you are interested in importing Wiki and Merge Request data to your new instance, you'll need to follow the instructions for [project export](http://docs.gitlab.com/ce/user/project/settings/import_export.html) + ![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 From 3a6cbd669e657c198ca7fb5023def9a92e38f7ba Mon Sep 17 00:00:00 2001 From: Lee Matos Date: Thu, 15 Dec 2016 14:29:54 +0000 Subject: [PATCH 2/3] applying style guide fixes --- doc/workflow/importing/import_projects_from_gitlab_com.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/workflow/importing/import_projects_from_gitlab_com.md b/doc/workflow/importing/import_projects_from_gitlab_com.md index ae4e92bd7cd..bbb39e1641c 100644 --- a/doc/workflow/importing/import_projects_from_gitlab_com.md +++ b/doc/workflow/importing/import_projects_from_gitlab_com.md @@ -5,7 +5,8 @@ GitLab support is enabled on your GitLab instance. You can read more about GitLab support [here](http://docs.gitlab.com/ce/integration/gitlab.html) To get to the importer page you need to go to "New project" page. -Note: If you are interested in importing Wiki and Merge Request data to your new instance, you'll need to follow the instructions for [project export](http://docs.gitlab.com/ce/user/project/settings/import_export.html) +>**Note:** +If you are interested in importing Wiki and Merge Request data to your new instance, you'll need to follow the instructions for [project export](../../user/project/settings/import_export.html) ![New project page](gitlab_importer/new_project_page.png) From 24ef4081a6723c22d54cf3492efaaad9fba1f77f Mon Sep 17 00:00:00 2001 From: Lee Matos Date: Thu, 15 Dec 2016 14:57:28 +0000 Subject: [PATCH 3/3] Update html link to markdown link --- doc/workflow/importing/import_projects_from_gitlab_com.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/workflow/importing/import_projects_from_gitlab_com.md b/doc/workflow/importing/import_projects_from_gitlab_com.md index bbb39e1641c..b27125a44de 100644 --- a/doc/workflow/importing/import_projects_from_gitlab_com.md +++ b/doc/workflow/importing/import_projects_from_gitlab_com.md @@ -6,7 +6,7 @@ You can read more about GitLab support [here](http://docs.gitlab.com/ce/integrat To get to the importer page you need to go to "New project" page. >**Note:** -If you are interested in importing Wiki and Merge Request data to your new instance, you'll need to follow the instructions for [project export](../../user/project/settings/import_export.html) +If you are interested in importing Wiki and Merge Request data to your new instance, you'll need to follow the instructions for [project export](../../user/project/settings/import_export.md) ![New project page](gitlab_importer/new_project_page.png)