diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-05-12 11:21:56 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-05-12 11:26:43 +0200 |
| commit | 125cb9b866b66a4ae21a3fec8ae5ad6e1b3ae4ec (patch) | |
| tree | ca2371ba805ccaea0410a302b831ef42be72716a /lib | |
| parent | f84e78f3d750776793371940803b7ff781050f09 (diff) | |
| download | gitlab-ce-125cb9b866b66a4ae21a3fec8ae5ad6e1b3ae4ec.tar.gz | |
Don't accidentally unblock auto created users from Active Directory.ad-block_auto_created_users
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 |