Commit 3a9bda2a authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

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

parents ec56ebb4 0b85f542
...@@ -51,7 +51,8 @@ module Gitlab ...@@ -51,7 +51,8 @@ module Gitlab
elsif entry.respond_to? :memberof elsif entry.respond_to? :memberof
entry.memberof entry.memberof
else else
raise 'Unsupported member attribute' Rails.logger.warn("Could not find member DNs for LDAP group #{entry.inspect}")
[]
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment