diff options
| author | Alexander Keramidas <dev.alexkeramidas@gmail.com> | 2017-08-29 11:57:41 +0300 |
|---|---|---|
| committer | Alexander Keramidas <dev.alexkeramidas@gmail.com> | 2017-09-06 16:38:52 +0300 |
| commit | 4df54f260751a832ebf0b8c18524020d6604994b (patch) | |
| tree | 2337fd9cc3fe1a1c82d9cc980dcce22465e493ce /lib/gitlab/ldap/user.rb | |
| parent | 021fb512e3c3f4b317307358dee8eecf448599b0 (diff) | |
Profile updates from providers
Diffstat (limited to 'lib/gitlab/ldap/user.rb')
| -rw-r--r-- | lib/gitlab/ldap/user.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/ldap/user.rb b/lib/gitlab/ldap/user.rb index 39180dc17d9..3bf27b37ae6 100644 --- a/lib/gitlab/ldap/user.rb +++ b/lib/gitlab/ldap/user.rb @@ -36,7 +36,7 @@ module Gitlab end def find_by_email - ::User.find_by(email: auth_hash.email.downcase) if auth_hash.has_email? + ::User.find_by(email: auth_hash.email.downcase) if auth_hash.has_attribute?(:email) end def update_user_attributes @@ -60,7 +60,7 @@ module Gitlab ldap_config.block_auto_created_users end - def sync_email_from_provider? + def sync_profile_from_provider? true end |