summaryrefslogtreecommitdiff
path: root/app/views/dashboard/todos/_todo.html.haml
diff options
context:
space:
mode:
authorAlfredo Sumaran <alfredo@gitlab.com>2016-04-28 13:54:13 -0500
committerJacob Schatz <jschatz1@gmail.com>2016-05-25 08:15:20 -0400
commit33be8181ac7a7885ccf5ea4850a87908d974ac28 (patch)
tree9b1b70a89720485b39019d11a6ddecde489a4630 /app/views/dashboard/todos/_todo.html.haml
parent5fb1de3426d187d2e8d4fe01635a19ac8062e3d2 (diff)
downloadgitlab-ce-33be8181ac7a7885ccf5ea4850a87908d974ac28.tar.gz
Add target status
Diffstat (limited to 'app/views/dashboard/todos/_todo.html.haml')
-rw-r--r--app/views/dashboard/todos/_todo.html.haml4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/views/dashboard/todos/_todo.html.haml b/app/views/dashboard/todos/_todo.html.haml
index 539f1dc6036..1f4a03cda2e 100644
--- a/app/views/dashboard/todos/_todo.html.haml
+++ b/app/views/dashboard/todos/_todo.html.haml
@@ -17,6 +17,10 @@
&middot; #{time_ago_with_tooltip(todo.created_at)}
+ - if (todo.target.is_a?(MergeRequest) || todo.target.is_a?(Issue)) && ['closed', 'merged'].include?(todo.target.state)
+ %span.target-status
+ = todo_target_state_pill(todo)
+
- if todo.pending?
.todo-actions.pull-right
= link_to [:dashboard, todo], method: :delete, class: 'btn btn-loading done-todo' do