diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2016-03-10 12:37:14 +0100 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2016-03-10 12:37:14 +0100 |
| commit | e7df3f51c9cc246279da36c9488b4c591f30b866 (patch) | |
| tree | 123e38968f0ac6bf17899a62ef9411d17f130d0b /lib/gitlab/user_access.rb | |
| parent | 0223b58f019fc3ce906c97caf8c6e361fa4302be (diff) | |
| download | gitlab-ce-e7df3f51c9cc246279da36c9488b4c591f30b866.tar.gz | |
Move method to User
Diffstat (limited to 'lib/gitlab/user_access.rb')
| -rw-r--r-- | lib/gitlab/user_access.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/gitlab/user_access.rb b/lib/gitlab/user_access.rb index 46ac5825fd1..d1b42c1f9b9 100644 --- a/lib/gitlab/user_access.rb +++ b/lib/gitlab/user_access.rb @@ -3,9 +3,8 @@ module Gitlab def self.allowed?(user) return false if user.blocked? - if user.requires_ldap_check? && Gitlab::LDAP::Access.try_lock_user(user) - return Gitlab::LDAP::Access.allowed?(user) - end + if user.requires_ldap_check? && user.try_obtain_ldap_lease + return false unless Gitlab::LDAP::Access.allowed?(user) end true |