summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorJacopo <beschi.jacopo@gmail.com>2017-04-10 17:51:15 +0200
committerJacopo <beschi.jacopo@gmail.com>2017-04-28 14:24:32 +0200
commit60e9405bb71cef461a4bc2d6a5d706a558a9dc32 (patch)
treeacde27624d0e76f7384010f1d4e9c615db7e2e51 /app/views
parent9a905e1b9f9575bb8d637560cb3c59fd82079d2d (diff)
downloadgitlab-ce-60e9405bb71cef461a4bc2d6a5d706a558a9dc32.tar.gz
Improve text on todo list when the todo action comes from yourself
Improved todo message when an issue is assigned to yourself. - The new message when an user assign to himself an issue or a mr is: "You assigned issue xx to yourself" - The new message when an user adds a todo to himself is: "You added a todo for issue xx" - The new message when and user mention himself is: "You mentioned yourself on issue xx" - The new message when an user directly address himself is: "You directly addressed yourself on issue xx" - The new message when an user mark himself as an approver is: "You set yourself as an approver for merge request xx"
Diffstat (limited to 'app/views')
-rw-r--r--app/views/dashboard/todos/_todo.html.haml6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/views/dashboard/todos/_todo.html.haml b/app/views/dashboard/todos/_todo.html.haml
index d0c12aa57ae..38fd053ae65 100644
--- a/app/views/dashboard/todos/_todo.html.haml
+++ b/app/views/dashboard/todos/_todo.html.haml
@@ -9,7 +9,7 @@
.title-item.author-name
- if todo.author
- = link_to_author(todo)
+ = link_to_author(todo, self_added: todo.self_added?)
- else
(removed)
@@ -22,6 +22,10 @@
- else
(removed)
+ - if todo.self_assigned?
+ .title-item.action-name
+ to yourself
+
.title-item
&middot;