Commit ee9d1ac9 authored by Blair Lunceford's avatar Blair Lunceford

Updated docs and config example

parent 869246d0
...@@ -893,7 +893,7 @@ production: &base ...@@ -893,7 +893,7 @@ production: &base
# Define the allowed providers using an array, e.g. ["saml", "twitter"], or as true/false to # Define the allowed providers using an array, e.g. ["saml", "twitter"], or as true/false to
# allow all providers or none. # allow all providers or none.
# (default: false) # (default: false)
auto_link_user: ["saml"] auto_link_user: ["saml", "twitter"]
# Set different Omniauth providers as external so that all users creating accounts # Set different Omniauth providers as external so that all users creating accounts
# via these providers will not be able to have access to internal projects. You # via these providers will not be able to have access to internal projects. You
......
...@@ -144,7 +144,8 @@ The chosen OmniAuth provider is now active and can be used to sign in to GitLab ...@@ -144,7 +144,8 @@ The chosen OmniAuth provider is now active and can be used to sign in to GitLab
> [Introduced in GitLab 13.4.](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/36664) > [Introduced in GitLab 13.4.](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/36664)
You can automatically link OmniAuth users with existing GitLab users if their email addresses match by adding the following setting: You can automatically link OmniAuth users with existing GitLab users if their email addresses match.
For example, the following setting is used to enable the auto link feature for both a SAML provider and the Twitter OAuth provider:
**For Omnibus installations** **For Omnibus installations**
......
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