Make sure the filters are applied

1 files changed, 9 insertions, 8 deletions

diff --git a/lib/gitlab/ldap/authentication.rb b/lib/gitlab/ldap/authentication.rb
index 0eca9b26133..8d306a74c15 100644
--- 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|
-          # Apply LDAP user filter if present
-          if config.user_filter.present?
-            Net::LDAP::Filter.join(
-              filter,
-              Net::LDAP::Filter.construct(config.user_filter)
-            )
-          end
+        filter = Net::LDAP::Filter.eq(config.uid, login)
+
+        # Apply LDAP user filter if present
+        if config.user_filter.present?
+          filter = Net::LDAP::Filter.join(
+            filter,
+            Net::LDAP::Filter.construct(config.user_filter)
+          )
         end
+        filter
       end
 
       def user