summaryrefslogtreecommitdiff
path: root/doc/api/notes.md
diff options
context:
space:
mode:
authorDouglas Barbosa Alexandre <dbalexandre@gmail.com>2015-12-04 18:09:22 -0200
committerDouglas Barbosa Alexandre <dbalexandre@gmail.com>2015-12-04 18:09:22 -0200
commit23c1c70bf0321941ab2b9572a5d0532ed9f58002 (patch)
tree9386f7d3ad81a0499c883ec6ddf781a023904a97 /doc/api/notes.md
parent9ca41f3ab25bdd98f49541555b23be9c31b1e390 (diff)
parente7e22ece5a63d15c221a73cd544ae83a33770bfe (diff)
downloadgitlab-ce-23c1c70bf0321941ab2b9572a5d0532ed9f58002.tar.gz
Merge branch 'master' into fix-admin-should-be-able-to-add-himself-to-group
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"
}
```