Commit bd0c171c authored by Markus Koller's avatar Markus Koller

fixup! Log messages when blocking/unblocking LDAP accounts

parent 9bdbf841
...@@ -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
......
...@@ -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
......
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