diff options
| author | Gabriel Mazetto <gabriel@gitlab.com> | 2016-01-07 14:01:01 -0200 |
|---|---|---|
| committer | Gabriel Mazetto <gabriel@gitlab.com> | 2016-01-08 16:26:04 -0200 |
| commit | 47e4613f4adc2d6ef4b066a87ec772ef8044bdd5 (patch) | |
| tree | 7abd1329e62dd97657dce22ad83f9500817c0d42 /lib/gitlab/ldap | |
| parent | ec67e9be1d7486199b47e19c766202a8bfdefe93 (diff) | |
| download | gitlab-ce-47e4613f4adc2d6ef4b066a87ec772ef8044bdd5.tar.gz | |
Code style fixes and some code simplified
Diffstat (limited to 'lib/gitlab/ldap')
| -rw-r--r-- | lib/gitlab/ldap/access.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/gitlab/ldap/access.rb b/lib/gitlab/ldap/access.rb index 76cb48d7aa6..ebd9260ad5d 100644 --- a/lib/gitlab/ldap/access.rb +++ b/lib/gitlab/ldap/access.rb @@ -40,7 +40,9 @@ module Gitlab user.ldap_block false else - user.activate if (user.blocked? && !ldap_config.block_auto_created_users) || user.ldap_blocked? + if (user.blocked? && !ldap_config.block_auto_created_users) || user.ldap_blocked? + user.activate + end true end else |