summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/ldap/access.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/gitlab/ldap/access.rb b/lib/gitlab/ldap/access.rb
index ebd9260ad5d..a659d179b5f 100644
--- a/lib/gitlab/ldap/access.rb
+++ b/lib/gitlab/ldap/access.rb
@@ -40,9 +40,7 @@ module Gitlab
user.ldap_block
false
else
- if (user.blocked? && !ldap_config.block_auto_created_users) || user.ldap_blocked?
- user.activate
- end
+ user.activate if user.ldap_blocked?
true
end
else