Make sure the filters are applied

d3056feb · Jan-Willem van der Meer · b229b0f0 · d3056feb
Commit d3056feb authored Oct 14, 2014 by Jan-Willem van der Meer
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 8 deletions

lib/gitlab/ldap/authentication.rb lib/gitlab/ldap/authentication.rb +9 -8

No files found.
--- a/lib/gitlab/ldap/authentication.rb
+++ b/lib/gitlab/ldap/authentication.rb
@@ -48,15 +48,16 @@ module Gitlab
      end
      def user_filter(login)
-        Net::LDAP::Filter.eq(config.uid, login).tap do |filter|
+        filter = Net::LDAP::Filter.eq(config.uid, login)
-          # Apply LDAP user filter if present
-          if config.user_filter.present?
+        # Apply LDAP user filter if present
-            Net::LDAP::Filter.join(
+        if config.user_filter.present?
-              filter,
+          filter = Net::LDAP::Filter.join(
-              Net::LDAP::Filter.construct(config.user_filter)
+            filter,
-            )
+            Net::LDAP::Filter.construct(config.user_filter)
-          end
+          )
        end
+        filter
      end
      def user