BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
2b9b0789
Commit
2b9b0789
authored
Mar 12, 2016
by
Douwe Maan
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'nico-de-ceulaer/gitlab-ce-13865-handle-other-emails-for-avatar-lookup'
# Conflicts: # app/helpers/application_helper.rb
parents
491d0ae1
3447ffbe
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
application_helper.rb
app/helpers/application_helper.rb
+1
-1
No files found.
app/helpers/application_helper.rb
View file @
2b9b0789
...
@@ -72,7 +72,7 @@ module ApplicationHelper
...
@@ -72,7 +72,7 @@ module ApplicationHelper
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
...
...
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