summaryrefslogtreecommitdiff
path: root/doc/api/merge_requests.md
diff options
context:
space:
mode:
authorJohannes Schleifenbaum <johannes@js-webcoding.de>2014-04-05 08:36:47 +0200
committerJohannes Schleifenbaum <johannes@js-webcoding.de>2014-04-05 08:37:42 +0200
commit49addad7b5f18776dbd593f628237736e638b28c (patch)
tree76f4b72c20dd8e92d596dd619791e81076d79fd0 /doc/api/merge_requests.md
parent1f1cfc9eba6d9b60decb4fcd0645fcbfd288925f (diff)
downloadgitlab-ce-49addad7b5f18776dbd593f628237736e638b28c.tar.gz
Api-Doc JSON lint
Fixes: #5505
Diffstat (limited to 'doc/api/merge_requests.md')
-rw-r--r--doc/api/merge_requests.md259
1 files changed, 129 insertions, 130 deletions
diff --git a/doc/api/merge_requests.md b/doc/api/merge_requests.md
index 3ce0fb84917..483c4188713 100644
--- a/doc/api/merge_requests.md
+++ b/doc/api/merge_requests.md
@@ -13,33 +13,33 @@ Parameters:
```json
[
- {
- "id":1,
- "iid":1,
- "target_branch":"master",
- "source_branch":"test1",
- "project_id":3,
- "title":"test1",
- "state":"opened",
- "upvotes":0,
- "downvotes":0,
- "author":{
- "id":1,
- "username": "admin",
- "email":"admin@local.host",
- "name":"Administrator",
- "state":"active",
- "created_at":"2012-04-29T08:46:00Z"
- },
- "assignee":{
- "id":1,
- "username": "admin",
- "email":"admin@local.host",
- "name":"Administrator",
- "state":"active",
- "created_at":"2012-04-29T08:46:00Z"
- }
+ {
+ "id": 1,
+ "iid": 1,
+ "target_branch": "master",
+ "source_branch": "test1",
+ "project_id": 3,
+ "title": "test1",
+ "state": "opened",
+ "upvotes": 0,
+ "downvotes": 0,
+ "author": {
+ "id": 1,
+ "username": "admin",
+ "email": "admin@local.host",
+ "name": "Administrator",
+ "state": "active",
+ "created_at": "2012-04-29T08:46:00Z"
+ },
+ "assignee": {
+ "id": 1,
+ "username": "admin",
+ "email": "admin@local.host",
+ "name": "Administrator",
+ "state": "active",
+ "created_at": "2012-04-29T08:46:00Z"
}
+ }
]
```
@@ -59,31 +59,31 @@ Parameters:
```json
{
- "id":1,
- "iid":1,
- "target_branch":"master",
- "source_branch":"test1",
- "project_id":3,
- "title":"test1",
- "state":"merged",
- "upvotes":0,
- "downvotes":0,
- "author":{
- "id":1,
- "username": "admin",
- "email":"admin@local.host",
- "name":"Administrator",
- "state":"active",
- "created_at":"2012-04-29T08:46:00Z"
- },
- "assignee":{
- "id":1,
- "username": "admin",
- "email":"admin@local.host",
- "name":"Administrator",
- "state":"active",
- "created_at":"2012-04-29T08:46:00Z"
- }
+ "id": 1,
+ "iid": 1,
+ "target_branch": "master",
+ "source_branch": "test1",
+ "project_id": 3,
+ "title": "test1",
+ "state": "merged",
+ "upvotes": 0,
+ "downvotes": 0,
+ "author": {
+ "id": 1,
+ "username": "admin",
+ "email": "admin@local.host",
+ "name": "Administrator",
+ "state": "active",
+ "created_at": "2012-04-29T08:46:00Z"
+ },
+ "assignee": {
+ "id": 1,
+ "username": "admin",
+ "email": "admin@local.host",
+ "name": "Administrator",
+ "state": "active",
+ "created_at": "2012-04-29T08:46:00Z"
+ }
}
```
@@ -106,30 +106,30 @@ Parameters:
```json
{
- "id":1,
- "target_branch":"master",
- "source_branch":"test1",
- "project_id":3,
- "title":"test1",
- "state":"opened",
- "upvotes":0,
- "downvotes":0,
- "author":{
- "id":1,
- "username": "admin",
- "email":"admin@local.host",
- "name":"Administrator",
- "state":"active",
- "created_at":"2012-04-29T08:46:00Z"
- },
- "assignee":{
- "id":1,
- "username": "admin",
- "email":"admin@local.host",
- "name":"Administrator",
- "state":"active",
- "created_at":"2012-04-29T08:46:00Z"
- }
+ "id": 1,
+ "target_branch": "master",
+ "source_branch": "test1",
+ "project_id": 3,
+ "title": "test1",
+ "state": "opened",
+ "upvotes": 0,
+ "downvotes": 0,
+ "author": {
+ "id": 1,
+ "username": "admin",
+ "email": "admin@local.host",
+ "name": "Administrator",
+ "state": "active",
+ "created_at": "2012-04-29T08:46:00Z"
+ },
+ "assignee": {
+ "id": 1,
+ "username": "admin",
+ "email": "admin@local.host",
+ "name": "Administrator",
+ "state": "active",
+ "created_at": "2012-04-29T08:46:00Z"
+ }
}
```
@@ -153,32 +153,31 @@ Parameters:
+ `state_event` - New state (close|reopen|merge)
```json
-
{
- "id":1,
- "target_branch":"master",
- "source_branch":"test1",
- "project_id":3,
- "title":"test1",
- "state":"opened",
- "upvotes":0,
- "downvotes":0,
- "author":{
- "id":1,
- "username": "admin",
- "email":"admin@local.host",
- "name":"Administrator",
- "state":"active",
- "created_at":"2012-04-29T08:46:00Z"
- },
- "assignee":{
- "id":1,
- "username": "admin",
- "email":"admin@local.host",
- "name":"Administrator",
- "state":"active",
- "created_at":"2012-04-29T08:46:00Z"
- }
+ "id": 1,
+ "target_branch": "master",
+ "source_branch": "test1",
+ "project_id": 3,
+ "title": "test1",
+ "state": "opened",
+ "upvotes": 0,
+ "downvotes": 0,
+ "author": {
+ "id": 1,
+ "username": "admin",
+ "email": "admin@local.host",
+ "name": "Administrator",
+ "state": "active",
+ "created_at": "2012-04-29T08:46:00Z"
+ },
+ "assignee": {
+ "id": 1,
+ "username": "admin",
+ "email": "admin@local.host",
+ "name": "Administrator",
+ "state": "active",
+ "created_at": "2012-04-29T08:46:00Z"
+ }
}
```
@@ -200,15 +199,15 @@ Parameters:
```json
{
- "author":{
- "id":1,
- "username": "admin",
- "email":"admin@local.host",
- "name":"Administrator",
- "blocked":false,
- "created_at":"2012-04-29T08:46:00Z"
- },
- "note":"text1"
+ "author": {
+ "id": 1,
+ "username": "admin",
+ "email": "admin@local.host",
+ "name": "Administrator",
+ "blocked": false,
+ "created_at": "2012-04-29T08:46:00Z"
+ },
+ "note": "text1"
}
```
@@ -228,27 +227,27 @@ Parameters:
```json
[
- {
- "note":"this is the 1st comment on the 2merge merge request",
- "author":{
- "id":11,
- "username":"admin",
- "email":"admin@local.host",
- "name":"Administrator",
- "state":"active",
- "created_at":"2014-03-06T08:17:35.000Z"
- }
- },
- {
- "note":"_Status changed to closed_",
- "author":{
- "id":11,
- "username":"admin",
- "email":"admin@local.host",
- "name":"Administrator",
- "state":"active",
- "created_at":"2014-03-06T08:17:35.000Z"
- }
+ {
+ "note": "this is the 1st comment on the 2merge merge request",
+ "author": {
+ "id": 11,
+ "username": "admin",
+ "email": "admin@local.host",
+ "name": "Administrator",
+ "state": "active",
+ "created_at": "2014-03-06T08:17:35.000Z"
+ }
+ },
+ {
+ "note": "_Status changed to closed_",
+ "author": {
+ "id": 11,
+ "username": "admin",
+ "email": "admin@local.host",
+ "name": "Administrator",
+ "state": "active",
+ "created_at": "2014-03-06T08:17:35.000Z"
}
+ }
]
```