summaryrefslogtreecommitdiff
path: root/doc/api/notes.md
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-12-07 17:12:29 +0100
committerDouwe Maan <douwe@gitlab.com>2015-12-07 17:12:29 +0100
commit5a9a8d03a798c8dfe154e5db4ddf6bcb7a14fa2c (patch)
treede42e220cf35f130e2d2d3d6b2290e639d959d6d /doc/api/notes.md
parentcbcb8dbe702c0b1532327aeb2dc53caffb6e8ed9 (diff)
parentbd5fb1b479f29df3c2150b6c375c1b7bffd28931 (diff)
downloadgitlab-ce-5a9a8d03a798c8dfe154e5db4ddf6bcb7a14fa2c.tar.gz
Merge branch 'master' into ui/dashboard-new-issue
Diffstat (limited to 'doc/api/notes.md')
-rw-r--r--doc/api/notes.md15
1 files changed, 12 insertions, 3 deletions
diff --git a/doc/api/notes.md b/doc/api/notes.md
index e7f299c0994..4d7ef288df8 100644
--- a/doc/api/notes.md
+++ b/doc/api/notes.md
@@ -35,7 +35,9 @@ Parameters:
"created_at": "2013-10-02T09:22:45Z",
"system": true,
"upvote": false,
- "downvote": false
+ "downvote": false,
+ "noteable_id": 377,
+ "noteable_type": "Issue"
},
{
"id": 305,
@@ -52,7 +54,9 @@ Parameters:
"created_at": "2013-10-02T09:56:03Z",
"system": true,
"upvote": false,
- "downvote": false
+ "downvote": false,
+ "noteable_id": 121,
+ "noteable_type": "Issue"
}
]
```
@@ -219,7 +223,12 @@ Parameters:
"state": "active",
"created_at": "2013-09-30T13:46:01Z"
},
- "created_at": "2013-10-02T08:57:14Z"
+ "created_at": "2013-10-02T08:57:14Z",
+ "system": false,
+ "upvote": false,
+ "downvote": false,
+ "noteable_id": 2,
+ "noteable_type": "MergeRequest"
}
```