Commit 8d74dbfa authored by Douwe Maan's avatar Douwe Maan

Merge branch 'ldap_fix_api' into 'master'

Fix bad Group class resolution when querying LDAP via API

When querying LDAP groups via the API, there was a 500 error with a strange stack. Thanks to @DouweM we figured out that in the context of the API, it's choosing `::Group` instead of `EE::Gitlab::LDAP::Group`. This makes it just specific enough to work. 

See merge request !572
parents a3e17719 1759609e
......@@ -22,7 +22,7 @@ module EE
options.merge!(size: size) if size
ldap_search(options).map do |entry|
Group.new(entry, self)
LDAP::Group.new(entry, self)
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