diff options
author | Jon Cairns <jon@joncairns.com> | 2015-11-03 09:25:26 +0000 |
---|---|---|
committer | Jon Cairns <jon@joncairns.com> | 2015-11-12 11:51:53 +0000 |
commit | e073b09f1f0d7b37ece6ecb3e7e485eb3f5e2e6f (patch) | |
tree | 1e3057855b029eb2de97fad55cdc237e89fddb94 | |
parent | 57430dc4da113b14989be61e30e161ae0686ff27 (diff) | |
download | gitlab-ce-e073b09f1f0d7b37ece6ecb3e7e485eb3f5e2e6f.tar.gz |
Add missing "omniauth" prefix to option in docs [ci skip]
Changes block_auto_created_users to omniauth_block_auto_created_users,
otherwise the option is ignored. Fixes #3319.
-rw-r--r-- | CHANGELOG | 1 | ||||
-rw-r--r-- | doc/integration/omniauth.md | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 588909d2578..932b1b2fa13 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -17,6 +17,7 @@ v 8.2.0 (unreleased) - Remove deprecated CI events from project settings page - Use issue editor as cross reference comment author when issue is edited with a new mention. - [API] Add ability to fetch the commit ID of the last commit that actually touched a file + - Fix omniauth documentation setting for omnibus configuration (Jon Cairns) v 8.1.1 - Fix cloning Wiki repositories via HTTP (Stan Hu) diff --git a/doc/integration/omniauth.md b/doc/integration/omniauth.md index c5cecbc2f2d..3348ada0157 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** |