Merge branch 'allow_empty_ldap_groups' of /home/git/repositories/gitlab/gitlab-ee

3a9bda2a · Dmitriy Zaporozhets · ec56ebb4 · 0b85f542 · 3a9bda2a
Commit 3a9bda2a authored Oct 22, 2013 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

lib/gitlab/ldap/group.rb lib/gitlab/ldap/group.rb +2 -1

No files found.
--- a/lib/gitlab/ldap/group.rb
+++ b/lib/gitlab/ldap/group.rb
@@ -51,7 +51,8 @@ module Gitlab
        elsif entry.respond_to? :memberof
          entry.memberof
        else
-          raise 'Unsupported member attribute'
+          Rails.logger.warn("Could not find member DNs for LDAP group #{entry.inspect}")
+          []
        end
      end