summaryrefslogtreecommitdiff
path: root/app/helpers
diff options
context:
space:
mode:
authorDouglas Barbosa Alexandre <dbalexandre@gmail.com>2016-03-09 19:22:43 +0000
committerDouglas Barbosa Alexandre <dbalexandre@gmail.com>2016-03-09 19:22:43 +0000
commit00a19f323bb72f29a048934c69d74bf96fe01767 (patch)
tree2f4b5ddc813c403f90067754edb8421c119f1ed2 /app/helpers
parent48fc02d24c850c9b5973668bfd448f3c56993564 (diff)
parentb100a9f206ce16391038bf7c2b0bd247b1bfe822 (diff)
downloadgitlab-ce-00a19f323bb72f29a048934c69d74bf96fe01767.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')
-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..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