Merge branch 'update_oauth_documentation' into 'master'

Update oauth documentation

See merge request !1411
This commit is contained in:
Dmitriy Zaporozhets 2015-01-19 20:59:09 +00:00
commit 20477eb5ca
3 changed files with 6 additions and 1 deletions

View file

@ -14,7 +14,7 @@ To enable the GitHub OmniAuth provider you must register your application with G
- 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.
- Authorization callback URL: 'https://gitlab.company.com/users/auth/github/callback'
- Authorization callback URL: 'https://gitlab.company.com/'
1. Select "Register application".
1. You should now see a Client ID and Client Secret near the top right of the page (see screenshot). Keep this page open as you continue configuration. ![GitHub app](github_app.png)

Binary file not shown.

Before

Width:  |  Height:  |  Size: 74 KiB

After

Width:  |  Height:  |  Size: 74 KiB

View file

@ -99,6 +99,11 @@ To make sure you didn't miss anything run a more thorough check with:
If all items are green, then congratulations upgrade is complete!
### 8. GitHub settings (if applicable)
If you are using GitHub as an OAuth provider for authentication, you should change the callback url so that it
only contains a root url (ex. `https://gitlab.my-company-com/`)
## Things went south? Revert to previous version (7.6)
### 1. Revert the code to the previous version