Commit bf6b028d authored by Evan Read's avatar Evan Read

Merge branch 'docs/clarify-autolink-users-saml-provider' into 'master'

Clarify autolink users for SAML provider

See merge request gitlab-org/gitlab!67926
parents 2b48010c 79431714
...@@ -162,19 +162,26 @@ The chosen OmniAuth provider is now active and can be used to sign in to GitLab ...@@ -162,19 +162,26 @@ The chosen OmniAuth provider is now active and can be used to sign in to GitLab
> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/36664) in GitLab 13.4. > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/36664) in GitLab 13.4.
You can automatically link OmniAuth users with existing GitLab users if their email addresses match. 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: Automatic linking using this method works for all providers
[except the SAML provider](https://gitlab.com/gitlab-org/gitlab/-/issues/338293). For automatic
linking using the SAML provider, see [SAML-specific](saml.md#general-setup) instructions.
As an example, the following configuration is used to enable the auto link feature for both:
- OpenID Connect provider.
- Twitter OAuth provider.
**For Omnibus installations** **For Omnibus installations**
```ruby ```ruby
gitlab_rails['omniauth_auto_link_user'] = ["saml", "twitter"] gitlab_rails['omniauth_auto_link_user'] = ["openid_connect", "twitter"]
``` ```
**For installations from source** **For installations from source**
```yaml ```yaml
omniauth: omniauth:
auto_link_user: ["saml", "twitter"] auto_link_user: ["openid_connect", "twitter"]
``` ```
## Configure OmniAuth Providers as External ## Configure OmniAuth Providers as External
......
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