summaryrefslogtreecommitdiff
path: root/doc/workflow/importing
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-06-27 13:42:22 +0200
committerRémy Coutable <remy@rymai.me>2016-06-30 18:48:17 +0200
commitce6635406c8e2e4d336d6d7738a1e4916036871c (patch)
tree630e743cfba4adc0e94c2020ed1e86efffc5704b /doc/workflow/importing
parent12aa1f898dbfea3aaeb2de351ac1cccef304717f (diff)
downloadgitlab-ce-ce6635406c8e2e4d336d6d7738a1e4916036871c.tar.gz
Make GH one-off auth the default again for importing GH projects
Advertise the PAT as an alternative unless GH import is not configured. Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'doc/workflow/importing')
-rw-r--r--doc/workflow/importing/import_projects_from_github.md8
1 files changed, 5 insertions, 3 deletions
diff --git a/doc/workflow/importing/import_projects_from_github.md b/doc/workflow/importing/import_projects_from_github.md
index 60894d52a76..a2b2a4b88f9 100644
--- a/doc/workflow/importing/import_projects_from_github.md
+++ b/doc/workflow/importing/import_projects_from_github.md
@@ -26,9 +26,11 @@ Click on the **GitHub** link and, if you are logged in via the GitHub
integration, you will be redirected to GitHub for permission to access your
projects. After accepting, you'll be automatically redirected to the importer.
-If you are not using the GitHub integration, when you click the **GithHub** link
-you'll be presented with instructions for creating Personal Access Token on
-GitHub. Once you upload your token, you'll be taken to the importer.
+If you are not using the GitHub integration, you can still perform a one-off
+authorization with GitHub to access your projects.
+
+Alternatively, you can also enter a GitHub Personal Access Token. Once you enter
+your token, you'll be taken to the importer.
![New project page on GitLab](img/import_projects_from_github_new_project_page.png)