summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcia Ramos <virtua.creative@gmail.com>2017-04-17 18:21:07 +0000
committerMarcia Ramos <virtua.creative@gmail.com>2017-04-17 18:21:07 +0000
commitbdaf3dfd0eb05db23719b8fc36396a41d4ba3d93 (patch)
treeb088feb84f78b860b6fb10aaead8e87f036da91e
parentf930a8870a0bd694863efa3e6520624b2410b95c (diff)
parent607fa9e7056553303e3c363a8ade6b6663765636 (diff)
downloadgitlab-ce-bdaf3dfd0eb05db23719b8fc36396a41d4ba3d93.tar.gz
Merge branch 'fix/github-doc-link' into 'master'
Add link to GitHub rake task Closes #30730 See merge request !10616
-rw-r--r--doc/workflow/importing/import_projects_from_github.md6
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/workflow/importing/import_projects_from_github.md b/doc/workflow/importing/import_projects_from_github.md
index aece4ab34ba..8ed1d98d05b 100644
--- a/doc/workflow/importing/import_projects_from_github.md
+++ b/doc/workflow/importing/import_projects_from_github.md
@@ -10,6 +10,11 @@ in your GitLab instance sitewide. This configuration is optional, users will
still be able to import their GitHub repositories with a
[personal access token][gh-token].
+>**Note:**
+Administrators of a GitLab instance (Community or Enterprise Edition) can also
+use the [GitHub rake task][gh-rake] to import projects from GitHub without the
+constrains of a Sidekiq worker.
+
- At its current state, GitHub importer can import:
- the repository description (GitLab 7.7+)
- the Git repository data (GitLab 7.7+)
@@ -112,5 +117,6 @@ You can also choose a different name for the project and a different namespace,
if you have the privileges to do so.
[gh-import]: ../../integration/github.md "GitHub integration"
+[gh-rake]: ../../administration/raketasks/github_import.md "GitHub rake task"
[gh-integration]: #authorize-access-to-your-repositories-using-the-github-integration
[gh-token]: #authorize-access-to-your-repositories-using-a-personal-access-token