diff --git a/doc/integration/omniauth.md b/doc/integration/omniauth.md index 211c5947287b8a132ce59f4503e39b7d0df70c88..e520e7c4a22d4c36d319e1f3e5f6d588c604ba00 100644 --- a/doc/integration/omniauth.md +++ b/doc/integration/omniauth.md @@ -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. 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** ```ruby -gitlab_rails['omniauth_auto_link_user'] = ["saml", "twitter"] +gitlab_rails['omniauth_auto_link_user'] = ["openid_connect", "twitter"] ``` **For installations from source** ```yaml omniauth: - auto_link_user: ["saml", "twitter"] + auto_link_user: ["openid_connect", "twitter"] ``` ## Configure OmniAuth Providers as External