diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2015-11-13 09:24:07 +0300 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2015-11-13 09:24:07 +0300 |
| commit | 8146509c0bde55674d6460525084f640ddaf2ade (patch) | |
| tree | 9b973cd3db370a4bcbb59f47290054827ebd3dc0 | |
| parent | 23ed732e39d4e40e9a8643c015fd167b1e654470 (diff) | |
| parent | 1c89db5e395cb3e5c90bab5d3587dbd07229a248 (diff) | |
Merge branch 'omniauth-doc-fix' into 'master'
Add missing "omniauth" prefix to option in docs
This MR is specifically a fix for #3319. I wanted to make my first contribution to GitLab, so I picked a simple one!
This changes the omniauth documentation for the `block_auto_created_users` option to `omniauth_block_auto_created_users`.
Thanks
---
closes #3319
See merge request !1734
| -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 62def42d959..9da838ed281 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -25,6 +25,7 @@ v 8.2.0 (unreleased) - Fix: 500 error returned if destroy request without HTTP referer (Kazuki Shimizu) - Remove deprecated CI events from project settings page - [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) - Add "New file" link to dropdown on project page - Include commit logs in project search - Add "added", "modified" and "removed" properties to commit object in webhook diff --git a/doc/integration/omniauth.md b/doc/integration/omniauth.md index bd9550c6ddb..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** |