summaryrefslogtreecommitdiff
path: root/doc/api/notes.md
diff options
context:
space:
mode:
authorZeger-Jan van de Weg <mail@zjvandeweg.nl>2015-12-07 12:06:20 +0100
committerZeger-Jan van de Weg <mail@zjvandeweg.nl>2015-12-07 12:06:20 +0100
commit3da32ef7d84f5800434379520878fe5c186b9e39 (patch)
tree3095a89ae3a75fca29f3be1b5d2a3d41824a81e1 /doc/api/notes.md
parent113325a9e02b06d9cef82b913e2ab6f33331371b (diff)
parent234f4bf20fb338f2164976fd39203fbc671afd29 (diff)
downloadgitlab-ce-3da32ef7d84f5800434379520878fe5c186b9e39.tar.gz
Merge branch 'master' into rake-tasks-git
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"
}
```