diff options
author | Florian <ffittschen@gmail.com> | 2016-05-06 13:55:59 +0000 |
---|---|---|
committer | Florian Fittschen <ffittschen@gmail.com> | 2016-10-21 14:57:15 +0200 |
commit | cfde451d36aa1c518654532c3e2cfffe5dfc2d98 (patch) | |
tree | 89ca613c93efbfed973bc3cab06d3441d1add11d /doc | |
parent | 1e66061b1ec5fb11457abca0845c13551afa8258 (diff) | |
download | gitlab-ce-cfde451d36aa1c518654532c3e2cfffe5dfc2d98.tar.gz |
Update github.md
Diffstat (limited to 'doc')
-rw-r--r-- | doc/integration/github.md | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/doc/integration/github.md b/doc/integration/github.md index 8a01afd1177..479c697b933 100644 --- a/doc/integration/github.md +++ b/doc/integration/github.md @@ -48,6 +48,21 @@ 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", + "args" => { "scope" => "user:email" } + } + ] + ``` + + For GitHub Enterprise: + ```ruby gitlab_rails['omniauth_providers'] = [ { @@ -86,7 +101,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. |