diff options
| author | Vinnie Okada <vokada@mrvinn.com> | 2015-03-14 10:49:11 -0600 |
|---|---|---|
| committer | Vinnie Okada <vokada@mrvinn.com> | 2015-03-14 10:49:11 -0600 |
| commit | ad0ca0499ac81c68e9e8011d2e194b16c759c1d6 (patch) | |
| tree | b3a39a2ef6cc4cfbdeab37fff87ed66dd4dcf9dc /doc/integration/github.md | |
| parent | 13e9f4f33420bf0bae0b61b98dd3c2301d6f6223 (diff) | |
| parent | 19e0dafbef47ca04f19d38b72b817beeb09e8510 (diff) | |
| download | gitlab-ce-ad0ca0499ac81c68e9e8011d2e194b16c759c1d6.tar.gz | |
Merge branch 'master' into fix-restricted-visibility
Conflicts:
db/schema.rb
Diffstat (limited to 'doc/integration/github.md')
| -rw-r--r-- | doc/integration/github.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/integration/github.md b/doc/integration/github.md index a9f1bc31bb4..b64501c2aaa 100644 --- a/doc/integration/github.md +++ b/doc/integration/github.md @@ -53,7 +53,7 @@ GitHub will generate an application ID and secret key for you to use. "app_id" => "YOUR_APP_ID", "app_secret" => "YOUR_APP_SECRET", "url" => "https://github.com/", - "args" => { "scope" => "user:email" } } + "args" => { "scope" => "user:email" } } ] ``` @@ -76,4 +76,4 @@ GitHub will generate an application ID and secret key for you to use. On the sign in page there should now be a GitHub icon below the regular sign in form. Click the icon to begin the authentication process. GitHub will ask the user to sign in and authorize the GitLab application. -If everything goes well the user will be returned to GitLab and will be signed in.
\ No newline at end of file +If everything goes well the user will be returned to GitLab and will be signed in. |