diff options
| author | Gabriel Mazetto <gabriel@gitlab.com> | 2015-12-30 20:56:26 -0200 |
|---|---|---|
| committer | Gabriel Mazetto <gabriel@gitlab.com> | 2016-01-08 16:26:04 -0200 |
| commit | d6dc088affeee4568e771e1d7894e0bcdb955af8 (patch) | |
| tree | ce15ef7f0c22bec6429cc1e202f956e95977f534 /lib/gitlab/ldap | |
| parent | 6e7db8e23e169bcbf0847ece27b9e44e00ae572b (diff) | |
| download | gitlab-ce-d6dc088affeee4568e771e1d7894e0bcdb955af8.tar.gz | |
LDAP synchronization block/unblock new states
Diffstat (limited to 'lib/gitlab/ldap')
| -rw-r--r-- | lib/gitlab/ldap/access.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/gitlab/ldap/access.rb b/lib/gitlab/ldap/access.rb index c438a3d167b..76cb48d7aa6 100644 --- a/lib/gitlab/ldap/access.rb +++ b/lib/gitlab/ldap/access.rb @@ -37,15 +37,15 @@ module Gitlab # Block user in GitLab if he/she was blocked in AD if Gitlab::LDAP::Person.disabled_via_active_directory?(user.ldap_identity.extern_uid, adapter) - user.block + user.ldap_block false else - user.activate if user.blocked? && !ldap_config.block_auto_created_users + user.activate if (user.blocked? && !ldap_config.block_auto_created_users) || user.ldap_blocked? true end else # Block the user if they no longer exist in LDAP/AD - user.block + user.ldap_block false end rescue |