diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-07-14 09:47:40 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-07-14 09:47:40 +0000 |
| commit | af2bcffb0771ef43eccc4330b366fe59b2d10ac4 (patch) | |
| tree | 27c5d0d198a07b05f8a98ce28cc397135ce4b4c9 | |
| parent | 7968484dfa363537e6e7822ca1ec100bcd0ec4f8 (diff) | |
| parent | 9290c755f3ba22a899e00288d4cba0b5929d6e2d (diff) | |
| download | gitlab-ce-af2bcffb0771ef43eccc4330b366fe59b2d10ac4.tar.gz | |
Merge branch 'mrchrisw/oauth-callback' into 'master'
Include default callback URL (OAuth)
## What does this MR do?
Adds information on the OAuth callback URL
## Are there points in the code the reviewer needs to double check?
None
## Why was this MR needed?
This information was missing.
## What are the relevant issue numbers?
http://www.twitter.com/designingcode/status/753511397124866049
## Does this MR meet the acceptance criteria?
- [X ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
See merge request !5246
| -rw-r--r-- | doc/integration/oauth_provider.md | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/integration/oauth_provider.md b/doc/integration/oauth_provider.md index 5f8bb57365c..0c53584d201 100644 --- a/doc/integration/oauth_provider.md +++ b/doc/integration/oauth_provider.md @@ -28,7 +28,8 @@ GitLab supports two ways of adding a new OAuth2 application to an instance. You can either add an application as a regular user or add it in the admin area. What this means is that GitLab can actually have instance-wide and a user-wide applications. There is no difference between them except for the different -permission levels they are set (user/admin). +permission levels they are set (user/admin). The default callback URL is +`http://your-gitlab.example.com/users/auth/gitlab/callback` ## Adding an application through the profile |