diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-07-25 13:00:38 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-07-27 13:13:47 +0200 |
| commit | 2a2ce716c6f2edc3918ef3549e96a809878bd47f (patch) | |
| tree | bb8f48fcc1176aad2deaa88d919031c304bfb8a7 | |
| parent | 9b84ca4dc07e31e53e43dee840f10538be258735 (diff) | |
| download | gitlab-ce-2a2ce716c6f2edc3918ef3549e96a809878bd47f.tar.gz | |
Merge branch 'api-mr-doc' into 'master'
Add iid to MR API response
## What does this MR do?
Adds `iid` parameter to the MR API docs.
## Why was this MR needed?
It is missing.
## What are the relevant issue numbers?
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/19578
## Does this MR meet the acceptance criteria?
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
See merge request !5468
Signed-off-by: Rémy Coutable <remy@rymai.me>
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | doc/api/merge_requests.md | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index c2c67ba96e0..14ade1fb6c2 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -6,6 +6,7 @@ v 8.10.2 (unreleased) - Fix backup restore. !5459 - Use project ID in repository cache to prevent stale data from persisting across projects. !5460 - Fix issue with autocomplete search not working with enter key. !5466 + - Add iid to MR API response. !5468 - Don't show comment button in gutter of diffs on MR discussion tab v 8.10.1 diff --git a/doc/api/merge_requests.md b/doc/api/merge_requests.md index a8c3b068d22..e00882e6d5d 100644 --- a/doc/api/merge_requests.md +++ b/doc/api/merge_requests.md @@ -276,6 +276,7 @@ Parameters: ```json { "id": 1, + "iid": 1, "target_branch": "master", "source_branch": "test1", "project_id": 3, @@ -350,6 +351,7 @@ Parameters: ```json { "id": 1, + "iid": 1, "target_branch": "master", "project_id": 3, "title": "test1", @@ -449,6 +451,7 @@ Parameters: ```json { "id": 1, + "iid": 1, "target_branch": "master", "source_branch": "test1", "project_id": 3, @@ -517,6 +520,7 @@ Parameters: ```json { "id": 1, + "iid": 1, "target_branch": "master", "source_branch": "test1", "project_id": 3, |