diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2015-12-04 18:11:49 -0200 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2015-12-04 18:11:49 -0200 |
| commit | 29e5506799cdf2068a7c7645b6210ad4e376d3cb (patch) | |
| tree | 9d112fa17db2c9d3cbffd0e7bbe9937f101253eb /doc/api/notes.md | |
| parent | 0decc7f941b96bf53e172de0340847d3b7d714b7 (diff) | |
| parent | e7e22ece5a63d15c221a73cd544ae83a33770bfe (diff) | |
| download | gitlab-ce-29e5506799cdf2068a7c7645b6210ad4e376d3cb.tar.gz | |
Merge branch 'master' into style-warning-about-mentioning-many-people-in-a-commentstyle-warning-about-mentioning-many-people-in-a-comment
Diffstat (limited to 'doc/api/notes.md')
| -rw-r--r-- | doc/api/notes.md | 15 |
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" } ``` |