diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-11-17 15:40:54 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-11-17 15:40:54 +0100 |
| commit | e849b51cae8956c9d4eebe9c42804443a55edb83 (patch) | |
| tree | 69d96404ed3d9fb6f10d59334cffce4c4cf62725 /doc/integration/omniauth.md | |
| parent | 56ea71a3b19396b01b3b8495337fbf22c534524f (diff) | |
| parent | 1c040b3f0a3ecb18fc8fdea3cf99b70edad8d873 (diff) | |
| download | gitlab-ce-e849b51cae8956c9d4eebe9c42804443a55edb83.tar.gz | |
Merge branch 'master' into james11/gitlab-ce-removable-group-owner
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) |