diff options
| author | Valery Sizov <valery@gitlab.com> | 2015-07-24 14:28:55 +0300 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2015-07-24 14:28:55 +0300 |
| commit | 70de5114fbedf7c6a4557b10649003f5ccba6804 (patch) | |
| tree | 073482203083c6f36346d8468c5aa94439b3adf0 /doc/integration | |
| parent | f84ba4c0262a60fb5e1f507261fb35706da6eb2a (diff) | |
| parent | 70a3c165a9f3882a82cf8946a783ace091635797 (diff) | |
Merge branch 'auth-icons-labels' into 'master'
Allow custom label to be set for authentication providers.
Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2341
Beside the above, I've:
- Refactored `OauthHelper` to have clearer method names and behaviour
- Moved some of `OauthHelper` behaviour to `Gitlab::OAuth::Provider`
- Renamed `OauthHelper` to `AuthHelper` since LDAP, SAML, Kerberos aren't OAuth
- Updated the icons for GitHub and GitLab
In the examples below, "OurAuth" is a SAML provider with a custom label.
See merge request !927
Diffstat (limited to 'doc/integration')
| -rw-r--r-- | doc/integration/omniauth.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/integration/omniauth.md b/doc/integration/omniauth.md index 8e2a602ec35..2010cb9b8a1 100644 --- a/doc/integration/omniauth.md +++ b/doc/integration/omniauth.md @@ -84,7 +84,7 @@ Existing users can enable OmniAuth for specific providers after the account is c 1. Sign in normally - whether standard sign in, LDAP, or another OmniAuth provider. 1. Go to profile settings (the silhouette icon in the top right corner). 1. Select the "Account" tab. -1. Under "Social Accounts" select the desired OmniAuth provider, such as Twitter. +1. Under "Connected Accounts" select the desired OmniAuth provider, such as Twitter. 1. The user will be redirected to the provider. Once the user authorized GitLab they will be redirected back to GitLab. The chosen OmniAuth provider is now active and can be used to sign in to GitLab from then on. |