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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
37cd2b9b
Commit
37cd2b9b
authored
May 18, 2018
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Minimize CE/EE difference in Gitlab::Auth::Saml::User
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
0a581fcf
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
4 deletions
+2
-4
lib/gitlab/auth/saml/user.rb
lib/gitlab/auth/saml/user.rb
+2
-4
No files found.
lib/gitlab/auth/saml/user.rb
View file @
37cd2b9b
...
@@ -20,10 +20,8 @@ module Gitlab
...
@@ -20,10 +20,8 @@ module Gitlab
user
||=
find_or_build_ldap_user
if
auto_link_ldap_user?
user
||=
find_or_build_ldap_user
if
auto_link_ldap_user?
user
||=
build_new_user
if
signup_enabled?
user
||=
build_new_user
if
signup_enabled?
if
external_users_enabled?
&&
user
if
user
# Check if there is overlap between the user's groups and the external groups
user
.
external
=
!
(
auth_hash
.
groups
&
saml_config
.
external_groups
).
empty?
if
external_users_enabled?
# setting then set user as external or internal.
user
.
external
=
!
(
auth_hash
.
groups
&
saml_config
.
external_groups
).
empty?
end
end
user
user
...
...
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