diff options
| author | Zeger-Jan van de Weg <mail@zjvandeweg.nl> | 2015-11-18 11:58:01 +0100 |
|---|---|---|
| committer | Zeger-Jan van de Weg <mail@zjvandeweg.nl> | 2015-11-18 11:58:01 +0100 |
| commit | 53b285c9a8b7eec9ee10906ef519da376347b69e (patch) | |
| tree | e3fa4f337112cedb08343e7d3ea85ecc1f48fb1d /doc/integration/omniauth.md | |
| parent | 2f048df4a4a83ff009d2ef2d14ee04e5a2798618 (diff) | |
| parent | 21a59b23fe4d8bc4331f746c75f9242a49d75faa (diff) | |
| download | gitlab-ce-53b285c9a8b7eec9ee10906ef519da376347b69e.tar.gz | |
Merge branch 'master' into merge-if-green
Diffstat (limited to 'doc/integration/omniauth.md')
| -rw-r--r-- | doc/integration/omniauth.md | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/doc/integration/omniauth.md b/doc/integration/omniauth.md index c5cecbc2f2d..f2b1721fc03 100644 --- a/doc/integration/omniauth.md +++ b/doc/integration/omniauth.md @@ -36,7 +36,7 @@ If you want to change these settings: ``` gitlab_rails['omniauth_enabled'] = true gitlab_rails['omniauth_allow_single_sign_on'] = false - gitlab_rails['block_auto_created_users'] = true + gitlab_rails['omniauth_block_auto_created_users'] = true ``` * **For installations from source** @@ -73,8 +73,9 @@ Now we can choose one or more of the Supported Providers below to continue confi - [Bitbucket](bitbucket.md) - [GitLab.com](gitlab.md) - [Google](google.md) -- [Shibboleth](shibboleth.md) +- [Facebook](facebook.md) - [Twitter](twitter.md) +- [Shibboleth](shibboleth.md) - [SAML](saml.md) - [Crowd](crowd.md) |