diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-03-09 14:47:04 -0300 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-03-09 14:47:04 -0300 |
| commit | 7500a12aae91231aba1021df2034d724126ba55f (patch) | |
| tree | 815925f8bd687db36f164122174da4f11d3acf8f | |
| parent | cac83cead523bc5a314950c2168fcebf8da8d405 (diff) | |
| download | gitlab-ce-7500a12aae91231aba1021df2034d724126ba55f.tar.gz | |
Avoid error 500 when todo author was removed
| -rw-r--r-- | app/helpers/application_helper.rb | 2 | ||||
| -rw-r--r-- | app/views/dashboard/todos/_todo.html.haml | 5 |
2 files changed, 5 insertions, 2 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 diff --git a/app/views/dashboard/todos/_todo.html.haml b/app/views/dashboard/todos/_todo.html.haml index f878d36e739..45cfe3da188 100644 --- a/app/views/dashboard/todos/_todo.html.haml +++ b/app/views/dashboard/todos/_todo.html.haml @@ -4,7 +4,10 @@ .todo-title %span.author-name - = link_to_author todo + - if todo.author + = link_to_author(todo) + - else + (removed) %span.todo-label = todo_action_name(todo) = todo_target_link(todo) |