summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-04-10 14:37:34 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-04-10 14:37:34 +0000
commitdbbf4818364638898d59b4c704facd7ad791211b (patch)
treee32522c0b7bb0d2c594e753a1a34907fb19110c0
parent9c576cc7e9414e64b4aac0544615e7d5e92c3558 (diff)
parenta5badd40ae7197fbf98edaf9367fe1c8c6e1b800 (diff)
downloadgitlab-ce-dbbf4818364638898d59b4c704facd7ad791211b.tar.gz
Merge branch 'todos-docs-update' into 'master'
Update todos.md Closes #30528 See merge request !10557
-rw-r--r--doc/workflow/todos.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/workflow/todos.md b/doc/workflow/todos.md
index 4b0fba842e9..3d8d3ce8f13 100644
--- a/doc/workflow/todos.md
+++ b/doc/workflow/todos.md
@@ -111,7 +111,7 @@ There are four kinds of filters you can use on your Todos dashboard.
| Type | Filter by issue or merge request |
| Action | Filter by the action that triggered the Todo |
-You can also filter by more than one of these at the same time.
+You can also filter by more than one of these at the same time. The possible Actions are `Any Action`, `Assigned`, `Mentioned`, `Added`, `Pipelines`, and `Directly Addressed`, [as described above](#what-triggers-a-todo).
[ce-2817]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2817
[ce-7926]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7926