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

Merge branch 'omniauth-doc-fix' into 'master'
8146509c · Achilleas Pipinellis · 23ed732e · 1c89db5e · 8146509c · 8146509c
Commit 8146509c authored Nov 13, 2015 by Achilleas Pipinellis
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

CHANGELOG CHANGELOG +1 -0

omniauth.md doc/integration/omniauth.md +1 -1

No files found.
--- 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

--- 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**