diff options
| author | Tiago Botelho <tiagonbotelho@hotmail.com> | 2017-09-12 10:50:28 +0100 |
|---|---|---|
| committer | Tiago Botelho <tiagonbotelho@hotmail.com> | 2017-09-25 09:44:31 +0100 |
| commit | 718e5b0865a0d871f01b12c22a15757dc1fcc66b (patch) | |
| tree | eb84180fcd3ffe2e8ddeb1779491aaaaf06c60b4 /lib/gitlab/ldap | |
| parent | 4d88f6496836c7fbf8a0f58e4d2604bf2c3f96d5 (diff) | |
| download | gitlab-ce-718e5b0865a0d871f01b12c22a15757dc1fcc66b.tar.gz | |
Attempt to link saml users to ldap by email
Diffstat (limited to 'lib/gitlab/ldap')
| -rw-r--r-- | lib/gitlab/ldap/person.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/gitlab/ldap/person.rb b/lib/gitlab/ldap/person.rb index 4d6f8ac79de..be64cc3991b 100644 --- a/lib/gitlab/ldap/person.rb +++ b/lib/gitlab/ldap/person.rb @@ -17,6 +17,10 @@ module Gitlab adapter.user('dn', dn) end + def self.find_by_email(email, adapter) + Array(adapter.config.attributes['email']).find { |attr| adapter.user(attr, email) } + end + def self.disabled_via_active_directory?(dn, adapter) adapter.dn_matches_filter?(dn, AD_USER_DISABLED) end |