summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorRobert Schilling <rschilling@student.tugraz.at>2016-05-21 19:01:11 +0200
committerRobert Schilling <rschilling@student.tugraz.at>2016-07-01 10:49:34 +0200
commit39e6f504fcb8c6cab511a50cdefd76e821bfec17 (patch)
tree36a8b9c41333f5bd0e832f94ee2c2d63ea707766 /app
parentb94088d5124b08349e5bd99c49a8ae3fcc5f5e6b (diff)
downloadgitlab-ce-39e6f504fcb8c6cab511a50cdefd76e821bfec17.tar.gz
Move to helper, no instance variables
Diffstat (limited to 'app')
-rw-r--r--app/models/todo.rb7
-rw-r--r--app/views/dashboard/todos/_todo.html.haml2
2 files changed, 1 insertions, 8 deletions
diff --git a/app/models/todo.rb b/app/models/todo.rb
index 42faecdf7f2..2792fa9b9a8 100644
--- a/app/models/todo.rb
+++ b/app/models/todo.rb
@@ -34,13 +34,6 @@ class Todo < ActiveRecord::Base
action == BUILD_FAILED
end
- def action_name
- case action
- when Todo::ASSIGNED then 'assigned you'
- when Todo::MENTIONED then 'mentioned you on'
- end
- end
-
def body
if note.present?
note.note
diff --git a/app/views/dashboard/todos/_todo.html.haml b/app/views/dashboard/todos/_todo.html.haml
index 421885eef5b..98f302d2f93 100644
--- a/app/views/dashboard/todos/_todo.html.haml
+++ b/app/views/dashboard/todos/_todo.html.haml
@@ -11,7 +11,7 @@
- else
(removed)
%span.todo-label
- = todo.action_name
+ = todo_action_name(todo)
- if todo.target
= todo_target_link(todo)
- else