diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-11-22 16:16:43 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-11-22 16:16:43 +0000 |
| commit | 7902395f1f97f5adcb89491b7ff18c05d99e8fe0 (patch) | |
| tree | f5ce11f4910097a76130065f542f8ca02be088d4 /doc | |
| parent | 26ec4b97bda157b3c2b9cdd87d426e9e576148a6 (diff) | |
| parent | 22d16ccdb59b1604fd71ce5c8469ee7217bed693 (diff) | |
| download | gitlab-ce-7902395f1f97f5adcb89491b7ff18c05d99e8fe0.tar.gz | |
Merge branch 'fix-api-iid-filter' into 'master'
Fix IID filter for merge requests and milestones
I updated the example in the docs and added a test. The milestones API was also broken for the same reason.
Related to !7358 and !7373
See merge request !7648
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/api/merge_requests.md | 1 | ||||
| -rw-r--r-- | doc/api/milestones.md | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/doc/api/merge_requests.md b/doc/api/merge_requests.md index f4167403c2c..4cc385e36fe 100644 --- a/doc/api/merge_requests.md +++ b/doc/api/merge_requests.md @@ -11,6 +11,7 @@ GET /projects/:id/merge_requests GET /projects/:id/merge_requests?state=opened GET /projects/:id/merge_requests?state=all GET /projects/:id/merge_requests?iid=42 +GET /projects/:id/merge_requests?iid[]=42&iid[]=43 ``` Parameters: diff --git a/doc/api/milestones.md b/doc/api/milestones.md index ae7d22a4be5..28e4b3105a6 100644 --- a/doc/api/milestones.md +++ b/doc/api/milestones.md @@ -7,6 +7,7 @@ Returns a list of project milestones. ``` GET /projects/:id/milestones GET /projects/:id/milestones?iid=42 +GET /projects/:id/milestones?iid[]=42&iid[]=43 GET /projects/:id/milestones?state=active GET /projects/:id/milestones?state=closed ``` @@ -16,7 +17,7 @@ Parameters: | Attribute | Type | Required | Description | | --------- | ---- | -------- | ----------- | | `id` | integer | yes | The ID of a project | -| `iid` | integer | optional | Return only the milestone having the given `iid` | +| `iid` | Array[integer] | optional | Return only the milestone having the given `iid` | | `state` | string | optional | Return only `active` or `closed` milestones` | ```bash |