Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornico de ceulaer <nico.deceulaer@tpvision.com>2016-03-03 16:50:21 +0300
committernico de ceulaer <nico.deceulaer@tpvision.com>2016-03-03 16:50:21 +0300
commit3447ffbe9a11375a0cee40e2d5fa47e632361a3b (patch)
tree632753b337da2f1d95b48d0aa5eb78ab313dd358 /app/helpers/application_helper.rb
parentbaa5f7fc25ad72db3b208724b7349d0944d219be (diff)
ensure also alternative email addresses are used when looking up user
Diffstat (limited to 'app/helpers/application_helper.rb')
-rw-r--r--app/helpers/application_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index f0aa2b57121..40a8b512e4c 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.downcase)
+ user = User.find_by_any_email(user_or_email.downcase)
end
if user