diff options
author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-03-09 19:22:43 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-03-10 10:35:34 +0100 |
commit | fe4d3abead763d627379bc348797dae81dfd5c17 (patch) | |
tree | 6209faf66a3279e7e281f7409bc2c6a571c7be92 /app/helpers/application_helper.rb | |
parent | 62fc5b6ab57bd01bae6c76f150e9bbb1a44c9085 (diff) | |
download | gitlab-ce-fe4d3abead763d627379bc348797dae81dfd5c17.tar.gz |
Merge branch 'fix-todos' into 'master'
Fix error 500 in Todos
Closes #14095
Closes #14075
Closes #14109
Closes #14151
See merge request !3141
Diffstat (limited to 'app/helpers/application_helper.rb')
-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 f0aa2b57121..368969c6472 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(email: user_or_email.try(:downcase)) end if user |