diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-12 13:28:33 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-12 13:28:33 +0000 |
| commit | 8b9e3af8bf7a6089a11ef3f5eb91dfef4940a3f4 (patch) | |
| tree | 8d7ee3bb08376dcfcbbdb38a886720af47224522 /lib | |
| parent | 0bac9d0135a7b925382e9beb2968059978a284af (diff) | |
| parent | 125cb9b866b66a4ae21a3fec8ae5ad6e1b3ae4ec (diff) | |
| download | gitlab-ce-8b9e3af8bf7a6089a11ef3f5eb91dfef4940a3f4.tar.gz | |
Merge branch 'ad-block_auto_created_users' into 'master'
Don't accidentally unblock auto created users from Active Directory.
Fixes #1581.
See merge request !638
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/ldap/access.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/ldap/access.rb b/lib/gitlab/ldap/access.rb index 960fb3849b4..16ff03c38d4 100644 --- a/lib/gitlab/ldap/access.rb +++ b/lib/gitlab/ldap/access.rb @@ -40,7 +40,7 @@ module Gitlab user.block unless user.blocked? false else - user.activate if user.blocked? + user.activate if user.blocked? && !ldap_config.block_auto_created_users true end else |