From 12aa1f898dbfea3aaeb2de351ac1cccef304717f Mon Sep 17 00:00:00 2001 From: Eric K Idema Date: Mon, 2 May 2016 11:22:38 -0400 Subject: Import from Github using Personal Access Tokens. This stands as an alternative to using OAuth to access a user's Github repositories. This is setup in such a way that it can be used without OAuth configuration. From a UI perspective, the how to import modal has been replaced by a full page, which includes a form for posting a personal access token back to the Import::GithubController. If the user has logged in via GitHub, skip the Personal Access Token and go directly to Github for an access token via OAuth. --- doc/workflow/importing/import_projects_from_github.md | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'doc/workflow') diff --git a/doc/workflow/importing/import_projects_from_github.md b/doc/workflow/importing/import_projects_from_github.md index a7dfac2c120..60894d52a76 100644 --- a/doc/workflow/importing/import_projects_from_github.md +++ b/doc/workflow/importing/import_projects_from_github.md @@ -1,8 +1,10 @@ # 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. +In order to enable the GitHub import setting, you may also want to +enable the [GitHub integration][gh-import] in your GitLab instance. This +configuration is optional, you will be able import your GitHub repositories +with a Personal Access Token. At its current state, GitHub importer can import: @@ -20,9 +22,13 @@ 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 -permission to access your projects. After accepting, you'll be automatically -redirected to the importer. +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. ![New project page on GitLab](img/import_projects_from_github_new_project_page.png) -- cgit v1.2.1