From 3ced0cd7040c2da2f6fff5e25f631187a186982b Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Tue, 27 Aug 2013 11:33:44 +0300
Subject: [PATCH] Ignore ldap groups check if ldap.group_base setting is empty

---
 lib/gitlab/ldap/access.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/gitlab/ldap/access.rb b/lib/gitlab/ldap/access.rb
index 3d61d4a039..2a6becd49f 100644
--- a/lib/gitlab/ldap/access.rb
+++ b/lib/gitlab/ldap/access.rb
@@ -8,6 +8,10 @@ module Gitlab
   module LDAP
     class Access
       def update_permissions(user)
+        # Skip updating group permissions
+        # if instance does not use group_base setting
+        return true unless Gitlab.config.ldap['group_base'].present?
+
         ldap_user = Gitlab::LDAP::Person.find(user.extern_uid)
         ldap_groups = ldap_user.groups
         ldap_groups_cn = ldap_groups.map(&:name)