From acd9bc0213098a5626499021eb72595eb556f9be Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Wed, 9 Mar 2016 19:11:24 +0100
Subject: Acquire lock before LDAP sync

---
 lib/gitlab/user_access.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib/gitlab/user_access.rb')

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
-- 
cgit v1.2.1