Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
9f1805af05aa
Commit
2b9b0789
authored
Mar 12, 2016
by
Douwe Maan
Browse files
Merge branch 'nico-de-ceulaer/gitlab-ce-13865-handle-other-emails-for-avatar-lookup'
# Conflicts: # app/helpers/application_helper.rb
parents
2e85b96c6295
775975b4f14a
Changes
1
Hide whitespace changes
Inline
Side-by-side
app/helpers/application_helper.rb
View file @
9f1805af
...
...
@@ -72,7 +72,7 @@ def avatar_icon(user_or_email = nil, size = nil, scale = 2)
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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment