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
Jérome Perrin
gitlab-ce
Commits
bd0c171c
Commit
bd0c171c
authored
Dec 20, 2016
by
Markus Koller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixup! Log messages when blocking/unblocking LDAP accounts
parent
9bdbf841
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
lib/gitlab/ldap/access.rb
lib/gitlab/ldap/access.rb
+1
-1
spec/lib/gitlab/ldap/access_spec.rb
spec/lib/gitlab/ldap/access_spec.rb
+1
-1
No files found.
lib/gitlab/ldap/access.rb
View file @
bd0c171c
...
@@ -34,7 +34,7 @@ module Gitlab
...
@@ -34,7 +34,7 @@ module Gitlab
def
allowed?
def
allowed?
if
ldap_user
if
ldap_user
unless
ldap_config
.
active_directory
unless
ldap_config
.
active_directory
unblock_user
(
user
,
'is
not in Active Directory anymore
'
)
if
user
.
ldap_blocked?
unblock_user
(
user
,
'is
available again
'
)
if
user
.
ldap_blocked?
return
true
return
true
end
end
...
...
spec/lib/gitlab/ldap/access_spec.rb
View file @
bd0c171c
...
@@ -103,7 +103,7 @@ describe Gitlab::LDAP::Access, lib: true do
...
@@ -103,7 +103,7 @@ describe Gitlab::LDAP::Access, lib: true do
end
end
it
'unblocks the user if it exists'
do
it
'unblocks the user if it exists'
do
expect
(
access
).
to
receive
(
:unblock_user
).
with
(
user
,
'is
not in Active Directory anymore
'
)
expect
(
access
).
to
receive
(
:unblock_user
).
with
(
user
,
'is
available again
'
)
access
.
allowed?
access
.
allowed?
end
end
...
...
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