summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-07-25 13:00:38 +0000
committerRémy Coutable <remy@rymai.me>2016-07-25 13:00:38 +0000
commit540ed8135bd559fc7aaaefa7c14d6b883663973b (patch)
treeacbc65790946872df996b8db6320a3a4dfba169a
parent8ce5b4f1a30c0ab904f67c544a6b7de1bb49e664 (diff)
parentaf4a74cbef300dbe98891d2b1c70bdaa9c381418 (diff)
downloadgitlab-ce-540ed8135bd559fc7aaaefa7c14d6b883663973b.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
-rw-r--r--doc/api/merge_requests.md4
1 files changed, 4 insertions, 0 deletions
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,