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
Tatuya Kamada
gitlab-ce
Commits
05a611a0
Commit
05a611a0
authored
Apr 11, 2016
by
Patricio Cano
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Better control flow and added guard clause.
parent
1d2429af
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
14 deletions
+9
-14
lib/gitlab/saml/user.rb
lib/gitlab/saml/user.rb
+9
-14
No files found.
lib/gitlab/saml/user.rb
View file @
05a611a0
...
@@ -26,8 +26,7 @@ module Gitlab
...
@@ -26,8 +26,7 @@ module Gitlab
@user
||=
build_new_user
@user
||=
build_new_user
end
end
unless
@user
.
nil?
if
external_users_enabled?
&&
@user
if
external_users_enabled?
# Check if there is overlap between the user's groups and the external groups
# Check if there is overlap between the user's groups and the external groups
# setting then set user as external or internal.
# setting then set user as external or internal.
if
(
auth_hash
.
groups
&
Gitlab
::
Saml
::
Config
.
external_groups
).
empty?
if
(
auth_hash
.
groups
&
Gitlab
::
Saml
::
Config
.
external_groups
).
empty?
...
@@ -36,7 +35,6 @@ module Gitlab
...
@@ -36,7 +35,6 @@ module Gitlab
@user
.
external
=
true
@user
.
external
=
true
end
end
end
end
end
@user
@user
end
end
...
@@ -50,11 +48,8 @@ module Gitlab
...
@@ -50,11 +48,8 @@ module Gitlab
end
end
def
changed?
def
changed?
if
gl_user
return
true
unless
gl_user
gl_user
.
changed?
||
gl_user
.
identities
.
any?
(
&
:changed?
)
gl_user
.
changed?
||
gl_user
.
identities
.
any?
(
&
:changed?
)
else
true
end
end
end
protected
protected
...
...
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