Properly fetch ldap groups

b5430b81 · Jan-Willem van der Meer · 9b678226 · b5430b81
Commit b5430b81 authored Oct 15, 2014 by Jan-Willem van der Meer
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

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

No files found.
--- a/lib/gitlab/ldap/access.rb
+++ b/lib/gitlab/ldap/access.rb
@@ -137,8 +137,7 @@ module Gitlab
      end
      def ldap_groups
-        @ldap_groups ||= ::LdapGroupLink.with_provider(provider)
+        @ldap_groups ||= ::LdapGroupLink.with_provider(provider).distinct(:cn).pluck(:cn).map do |cn|
-          distinct(:cn).pluck(:cn).map do |cn|
          Gitlab::LDAP::Group.find_by_cn(cn, adapter)
        end.compact
      end