diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2018-07-04 12:57:37 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-07-04 12:57:37 +0000 |
commit | 4d9a3f42f1fd3be21555e19872b7121cca65015e (patch) | |
tree | 9218831b49cb106165e01b41492981089a37de10 /doc | |
parent | ecf9c145f6e4d170cd059df88743393d9e63c489 (diff) | |
parent | 0d11c4a8c7f69278bdef812374e334ad11b1cd98 (diff) | |
download | gitlab-ce-4d9a3f42f1fd3be21555e19872b7121cca65015e.tar.gz |
Merge branch 'ee-5481-epic-todos' into 'master'
Port of Todos for epics
See merge request gitlab-org/gitlab-ce!19908
Diffstat (limited to 'doc')
-rw-r--r-- | doc/api/todos.md | 1 | ||||
-rw-r--r-- | doc/workflow/todos.md | 1 |
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 | |