Commit 2b9b0789 authored by Douwe Maan's avatar Douwe Maan
Browse files

Merge branch 'nico-de-ceulaer/gitlab-ce-13865-handle-other-emails-for-avatar-lookup'

# Conflicts:
#	app/helpers/application_helper.rb
...@@ -72,7 +72,7 @@ def avatar_icon(user_or_email = nil, size = nil, scale = 2) ...@@ -72,7 +72,7 @@ def avatar_icon(user_or_email = nil, size = nil, scale = 2)
if user_or_email.is_a?(User) if user_or_email.is_a?(User)
user = user_or_email user = user_or_email
else else
user = User.find_by(email: user_or_email.try(:downcase)) user = User.find_by_any_email(user_or_email.try(:downcase))
end end
if user if user
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment