Commit 8146509c authored by Achilleas Pipinellis's avatar Achilleas Pipinellis

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
parents 23ed732e 1c89db5e
...@@ -25,6 +25,7 @@ v 8.2.0 (unreleased) ...@@ -25,6 +25,7 @@ v 8.2.0 (unreleased)
- Fix: 500 error returned if destroy request without HTTP referer (Kazuki Shimizu) - Fix: 500 error returned if destroy request without HTTP referer (Kazuki Shimizu)
- Remove deprecated CI events from project settings page - 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 - [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 - Add "New file" link to dropdown on project page
- Include commit logs in project search - Include commit logs in project search
- Add "added", "modified" and "removed" properties to commit object in webhook - Add "added", "modified" and "removed" properties to commit object in webhook
......
...@@ -36,7 +36,7 @@ If you want to change these settings: ...@@ -36,7 +36,7 @@ If you want to change these settings:
``` ```
gitlab_rails['omniauth_enabled'] = true gitlab_rails['omniauth_enabled'] = true
gitlab_rails['omniauth_allow_single_sign_on'] = false 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** * **For installations from source**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment