diff options
| author | Gabriel Mazetto <gabriel@gitlab.com> | 2016-01-14 03:31:27 -0200 |
|---|---|---|
| committer | Gabriel Mazetto <gabriel@gitlab.com> | 2016-01-14 03:31:27 -0200 |
| commit | dd6fc01ff8a073880b67a323a547edeb5d63f167 (patch) | |
| tree | 6d6140793653da8699a038cf538e4fe763143649 /lib | |
| parent | fc7e6e8ffcb76e92b625b6490a966c830adc750a (diff) | |
| download | gitlab-ce-dd6fc01ff8a073880b67a323a547edeb5d63f167.tar.gz | |
fixed LDAP activation on login to use new ldap_blocked statefeature/ldap-sync-edgecases
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/ldap/access.rb | 4 |
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 |