Commit afb69488 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'ldap-unblock-user' into 'master'

Unblock user if they were unblocked in AD.

Fixes problem with !1687.

See merge request !1694
parents 48036751 8fed4352
...@@ -65,6 +65,7 @@ v 7.9.0 (unreleased) ...@@ -65,6 +65,7 @@ v 7.9.0 (unreleased)
- Fix import pages not working after first load. - Fix import pages not working after first load.
- Use custom LDAP label in LDAP signin form. - Use custom LDAP label in LDAP signin form.
- Execute hooks and services when branch or tag is created or deleted through web interface. - Execute hooks and services when branch or tag is created or deleted through web interface.
- Block and unblock user if he/she was blocked/unblocked in Active Directory
v 7.8.4 v 7.8.4
- Fix issue_tracker_id substitution in custom issue trackers - Fix issue_tracker_id substitution in custom issue trackers
......
...@@ -40,6 +40,7 @@ module Gitlab ...@@ -40,6 +40,7 @@ module Gitlab
user.block unless user.blocked? user.block unless user.blocked?
false false
else else
user.activate if user.blocked?
true true
end end
else else
......
...@@ -28,9 +28,18 @@ describe Gitlab::LDAP::Access do ...@@ -28,9 +28,18 @@ describe Gitlab::LDAP::Access do
end end
context 'and has no disabled flag in active diretory' do 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 { is_expected.to be_truthy }
it "should unblock user in GitLab" do
access.allowed?
user.should_not be_blocked
end
end end
context 'without ActiveDirectory enabled' do 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