diff options
| author | Florian <ffittschen@gmail.com> | 2016-05-06 13:55:59 +0000 |
|---|---|---|
| committer | Florian <ffittschen@gmail.com> | 2016-05-06 13:55:59 +0000 |
| commit | 88a66af9f334456b4c7f9a1407ab1c45cd98132d (patch) | |
| tree | 9d5060d191d70d003452a41e16eb69b58620311b | |
| parent | 0cdd4f310fed3d42c61060dd52dba96884638bb3 (diff) | |
| download | gitlab-ce-88a66af9f334456b4c7f9a1407ab1c45cd98132d.tar.gz | |
Update github.md
| -rw-r--r-- | doc/integration/github.md | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/doc/integration/github.md b/doc/integration/github.md index e7497e475c9..0c2e1756a50 100644 --- a/doc/integration/github.md +++ b/doc/integration/github.md @@ -19,7 +19,7 @@ GitHub will generate an application ID and secret key for you to use. - Application name: This can be anything. Consider something like "\<Organization\>'s GitLab" or "\<Your Name\>'s GitLab" or something else descriptive. - Homepage URL: The URL to your GitLab installation. 'https://gitlab.company.com' - Application description: Fill this in if you wish. - - Default authorization callback URL is '${YOUR_DOMAIN}/import/github/callback' + - Default authorization callback URL is '${YOUR_DOMAIN}' 1. Select "Register application". 1. You should now see a Client ID and Client Secret near the top right of the page (see screenshot). @@ -48,13 +48,14 @@ GitHub will generate an application ID and secret key for you to use. For omnibus package: + For GitHub.com: + ```ruby gitlab_rails['omniauth_providers'] = [ { "name" => "github", "app_id" => "YOUR_APP_ID", "app_secret" => "YOUR_APP_SECRET", - "url" => "https://github.com/", "args" => { "scope" => "user:email" } } ] @@ -86,7 +87,7 @@ GitHub will generate an application ID and secret key for you to use. 1. Change 'YOUR_APP_SECRET' to the client secret from the GitHub application page from step 7. -1. Save the configuration file. +1. Save the configuration file and run `sudo gitlab-ctl reconfigure`. 1. Restart GitLab for the changes to take effect. |