diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-19 03:10:16 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-19 03:10:16 +0300 |
| commit | 95bc188f0d9ae4bc074e02162f9084e173e41a69 (patch) | |
| tree | 31cfde39e36fc7a193343324fba40c9eb5bb54bf /doc | |
| parent | cb0a625459525122d2736a895a728edb3b8ea4ff (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/api/graphql/reference/index.md | 3 | ||||
| -rw-r--r-- | doc/api/group_iterations.md | 2 | ||||
| -rw-r--r-- | doc/api/iterations.md | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md index b0d2f6a28bd..1d2b29c9b56 100644 --- a/doc/api/graphql/reference/index.md +++ b/doc/api/graphql/reference/index.md @@ -14412,8 +14412,9 @@ State of a GitLab iteration. | ----- | ----------- | | <a id="iterationstateall"></a>`all` | | | <a id="iterationstateclosed"></a>`closed` | | +| <a id="iterationstatecurrent"></a>`current` | | | <a id="iterationstateopened"></a>`opened` | | -| <a id="iterationstatestarted"></a>`started` | | +| <a id="iterationstatestarted"></a>`started` **{warning-solid}** | **Deprecated** in 14.1. Use current instead. | | <a id="iterationstateupcoming"></a>`upcoming` | | ### `IterationWildcardId` diff --git a/doc/api/group_iterations.md b/doc/api/group_iterations.md index 3d72e035383..af27b558dfe 100644 --- a/doc/api/group_iterations.md +++ b/doc/api/group_iterations.md @@ -26,7 +26,7 @@ GET /groups/:id/iterations?search=version | Attribute | Type | Required | Description | | ------------------- | ------- | -------- | ----------- | -| `state` | string | no | Return only `opened`, `upcoming`, `started`, `closed`, or `all` iterations. Defaults to `all`. | +| `state` | string | no | 'Return `opened`, `upcoming`, `current (previously started)`, `closed`, or `all` iterations. Filtering by `started` state is deprecated starting with 14.1, please use `current` instead.' | | `search` | string | no | Return only iterations with a title matching the provided string. | | `include_ancestors` | boolean | no | Include iterations from parent group and its ancestors. Defaults to `true`. | diff --git a/doc/api/iterations.md b/doc/api/iterations.md index be52ef0ea47..c39c397f27e 100644 --- a/doc/api/iterations.md +++ b/doc/api/iterations.md @@ -28,7 +28,7 @@ GET /projects/:id/iterations?search=version | Attribute | Type | Required | Description | | ------------------- | ------- | -------- | ----------- | -| `state` | string | no | Return only `opened`, `upcoming`, `started`, `closed`, or `all` iterations. Defaults to `all`. | +| `state` | string | no | 'Return `opened`, `upcoming`, `current (previously started)`, `closed`, or `all` iterations. Filtering by `started` state is deprecated starting with 14.1, please use `current` instead.' | | `search` | string | no | Return only iterations with a title matching the provided string. | | `include_ancestors` | boolean | no | Include iterations from parent group and its ancestors. Defaults to `true`. | |