summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2018-08-07 12:35:32 +0000
committerSean McGivern <sean@mcgivern.me.uk>2018-08-07 12:35:32 +0000
commitb3deca7a2606a6b2cef464ed08417be4ffb0cb6b (patch)
tree58cb99a58196581520303a57e9f2024553649eae /doc
parent411070c3afa621a0bdc741617c1d17f54205b81a (diff)
parent6dc7490789237a84b66baaaf4c6deea5ec3bf2de (diff)
downloadgitlab-ce-b3deca7a2606a6b2cef464ed08417be4ffb0cb6b.tar.gz
Merge branch 'group-todos' into 'master'
Group todos See merge request gitlab-org/gitlab-ce!20675
Diffstat (limited to 'doc')
-rw-r--r--doc/api/todos.md1
-rw-r--r--doc/workflow/todos.md1
2 files changed, 2 insertions, 0 deletions
diff --git a/doc/api/todos.md b/doc/api/todos.md
index 27e623007cc..0843e4eedc6 100644
--- a/doc/api/todos.md
+++ b/doc/api/todos.md
@@ -18,6 +18,7 @@ Parameters:
| `action` | string | no | The action to be filtered. Can be `assigned`, `mentioned`, `build_failed`, `marked`, `approval_required`, `unmergeable` or `directly_addressed`. |
| `author_id` | integer | no | The ID of an author |
| `project_id` | integer | no | The ID of a project |
+| `group_id` | integer | no | The ID of a group |
| `state` | string | no | The state of the todo. Can be either `pending` or `done` |
| `type` | string | no | The type of a todo. Can be either `Issue` or `MergeRequest` |
diff --git a/doc/workflow/todos.md b/doc/workflow/todos.md
index 760cd87d4cc..dda82352c67 100644
--- a/doc/workflow/todos.md
+++ b/doc/workflow/todos.md
@@ -109,6 +109,7 @@ There are four kinds of filters you can use on your Todos dashboard.
| Filter | Description |
| ------- | ----------- |
| Project | Filter by project |
+| Group | Filter by group |
| Author | Filter by the author that triggered the Todo |
| Type | Filter by issue or merge request |
| Action | Filter by the action that triggered the Todo |