Commit 8fed4352 authored by Douwe Maan's avatar Douwe Maan

Unblock user if they were unblocked in AD.

parent 606d24ff
......@@ -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/unblocked in Active Directory
v 7.8.4
- Fix issue_tracker_id substitution in custom issue trackers
......
......@@ -40,6 +40,7 @@ def allowed?
user.block unless user.blocked?
false
else
user.activate if user.blocked?
true
end
else
......
......@@ -28,9 +28,18 @@
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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment