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
Léo-Paul Géneau
gitlab-ce
Commits
8fed4352
Commit
8fed4352
authored
9 years ago
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Unblock user if they were unblocked in AD.
parent
606d24ff
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
2 deletions
+12
-2
CHANGELOG
CHANGELOG
+1
-1
lib/gitlab/ldap/access.rb
lib/gitlab/ldap/access.rb
+1
-0
spec/lib/gitlab/ldap/access_spec.rb
spec/lib/gitlab/ldap/access_spec.rb
+10
-1
No files found.
CHANGELOG
View file @
8fed4352
...
...
@@ -60,7 +60,7 @@ v 7.9.0 (unreleased)
- Remove annoying notice messages when create/update merge request
- Allow smb:// links in Markdown text.
- Filter merge request by title or description at Merge Requests page
- Block
user if he/she was
blocked in Active Directory
- Block
and unblock user if he/she was blocked/un
blocked in Active Directory
v 7.8.4
- Fix issue_tracker_id substitution in custom issue trackers
...
...
This diff is collapsed.
Click to expand it.
lib/gitlab/ldap/access.rb
View file @
8fed4352
...
...
@@ -40,6 +40,7 @@ module Gitlab
user
.
block
unless
user
.
blocked?
false
else
user
.
activate
if
user
.
blocked?
true
end
else
...
...
This diff is collapsed.
Click to expand it.
spec/lib/gitlab/ldap/access_spec.rb
View file @
8fed4352
...
...
@@ -28,9 +28,18 @@ describe Gitlab::LDAP::Access do
end
context
'and has no disabled flag in active diretory'
do
before
{
Gitlab
::
LDAP
::
Person
.
stub
(
disabled_via_active_directory?:
false
)
}
before
do
user
.
block
Gitlab
::
LDAP
::
Person
.
stub
(
disabled_via_active_directory?:
false
)
end
it
{
is_expected
.
to
be_truthy
}
it
"should unblock user in GitLab"
do
access
.
allowed?
user
.
should_not
be_blocked
end
end
context
'without ActiveDirectory enabled'
do
...
...
This diff is collapsed.
Click to expand it.
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