Merge branch 'todos-docs-update' into 'master'

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