diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-08-30 11:16:45 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-08-30 11:16:45 +0400 |
| commit | 14f5199cdcd9a84bdd273b24ba8d8f2eb9f60c23 (patch) | |
| tree | c3b92e307179a44b198b9279a17d5091777ae8ba /lib/gitlab | |
| parent | cb71b26353b4b3d927e20678b6f26c50c7d7b7c2 (diff) | |
| parent | 0d5ae2802e887dcd95fe537a59450a2c0f548382 (diff) | |
Merge branch 'feature-ldap-tests' into 'master'
Feature ldap tests
Move specs to proper places. Relates to #154
This is already mergeable, will continue in a new branch for additions & refactorings.
See merge request !1053
Diffstat (limited to 'lib/gitlab')
| -rw-r--r-- | lib/gitlab/ldap/adapter.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/gitlab/ldap/adapter.rb b/lib/gitlab/ldap/adapter.rb index ca239bea884..68ac1b22909 100644 --- a/lib/gitlab/ldap/adapter.rb +++ b/lib/gitlab/ldap/adapter.rb @@ -86,7 +86,8 @@ module Gitlab end def dn_matches_filter?(dn, filter) - ldap_search(base: dn, filter: filter, scope: Net::LDAP::SearchScope_BaseObject, attributes: %w{dn}).any? + ldap_search(base: dn, filter: filter, + scope: Net::LDAP::SearchScope_BaseObject, attributes: %w{dn}).any? end def ldap_search(*args) |