Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
ee9d1ac9
Commit
ee9d1ac9
authored
Sep 04, 2020
by
Blair Lunceford
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated docs and config example
parent
869246d0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
config/gitlab.yml.example
config/gitlab.yml.example
+1
-1
doc/integration/omniauth.md
doc/integration/omniauth.md
+2
-1
No files found.
config/gitlab.yml.example
View file @
ee9d1ac9
...
@@ -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
...
...
doc/integration/omniauth.md
View file @
ee9d1ac9
...
@@ -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**
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment