diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-03-12 13:12:40 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2016-03-12 13:12:40 +0100 |
| commit | 2b9b07891c402f6407a8b099fe67c78a43266ea1 (patch) | |
| tree | a02c9ef137ae934acc8b9d55cc61124f6467be1a /app/helpers | |
| parent | 491d0ae1c306f60919f8048844a130d89e41f565 (diff) | |
| parent | 3447ffbe9a11375a0cee40e2d5fa47e632361a3b (diff) | |
| download | gitlab-ce-2b9b07891c402f6407a8b099fe67c78a43266ea1.tar.gz | |
Merge branch 'nico-de-ceulaer/gitlab-ce-13865-handle-other-emails-for-avatar-lookup'
# Conflicts:
# app/helpers/application_helper.rb
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/application_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 368969c6472..d1b1c61b710 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -72,7 +72,7 @@ module ApplicationHelper if user_or_email.is_a?(User) user = user_or_email else - user = User.find_by(email: user_or_email.try(:downcase)) + user = User.find_by_any_email(user_or_email.try(:downcase)) end if user |