diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2016-03-09 19:11:24 +0100 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2016-03-09 19:11:24 +0100 |
| commit | acd9bc0213098a5626499021eb72595eb556f9be (patch) | |
| tree | 5492c07f5e8f5695fd8c43120bda79a9e7286fdf /lib/gitlab/user_access.rb | |
| parent | 3eb7ea49feaf9341b2eec6eb0c58ae2f0aa37864 (diff) | |
| download | gitlab-ce-acd9bc0213098a5626499021eb72595eb556f9be.tar.gz | |
Acquire lock before LDAP sync
Diffstat (limited to 'lib/gitlab/user_access.rb')
| -rw-r--r-- | lib/gitlab/user_access.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/gitlab/user_access.rb b/lib/gitlab/user_access.rb index 4885baf9526..46ac5825fd1 100644 --- a/lib/gitlab/user_access.rb +++ b/lib/gitlab/user_access.rb @@ -3,8 +3,9 @@ module Gitlab def self.allowed?(user) return false if user.blocked? - if user.requires_ldap_check? - return false unless Gitlab::LDAP::Access.allowed?(user) + if user.requires_ldap_check? && Gitlab::LDAP::Access.try_lock_user(user) + return Gitlab::LDAP::Access.allowed?(user) + end end true |