diff options
| author | Stan Hu <stanhu@gmail.com> | 2015-07-09 15:29:14 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2015-07-09 15:29:14 +0000 |
| commit | add283bf685141b6ce6e41045c4c592fc3fd5b44 (patch) | |
| tree | 391f6f0216ddfbcffd5aec21877cad1ea97f6221 | |
| parent | 36f3e2062ded8b8b64cc5b724258e1ce95348ef5 (diff) | |
| parent | dd4fee5fdbda07fbc09234c4b043c3c9939a6a9b (diff) | |
| download | gitlab-ce-add283bf685141b6ce6e41045c4c592fc3fd5b44.tar.gz | |
Merge branch 'note-query-information' into 'master'
Note query information
The 'editable' field is required to be able to distinguish system-created notes from user comments. The 'upvote' and 'downvote' fields are so that endpoints don't need to duplicate GitLab's logic for what an up or downvote is.
See merge request !677
| -rw-r--r-- | doc/api/notes.md | 10 | ||||
| -rw-r--r-- | lib/api/entities.rb | 3 |
2 files changed, 11 insertions, 2 deletions
diff --git a/doc/api/notes.md b/doc/api/notes.md index ee2f9fa0eac..c683cb883d4 100644 --- a/doc/api/notes.md +++ b/doc/api/notes.md @@ -31,7 +31,10 @@ Parameters: "state": "active", "created_at": "2013-09-30T13:46:01Z" }, - "created_at": "2013-10-02T09:22:45Z" + "created_at": "2013-10-02T09:22:45Z", + "system": true, + "upvote": false, + "downvote": false }, { "id": 305, @@ -45,7 +48,10 @@ Parameters: "state": "active", "created_at": "2013-09-30T13:46:01Z" }, - "created_at": "2013-10-02T09:56:03Z" + "created_at": "2013-10-02T09:56:03Z", + "system": false, + "upvote": false, + "downvote": false } ] ``` diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 31202fa8c1f..27d60e881ec 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -190,6 +190,9 @@ module API expose :attachment_identifier, as: :attachment expose :author, using: Entities::UserBasic expose :created_at + expose :system + expose :upvote?, as: :upvote + expose :downvote?, as: :downvote end class MRNote < Grape::Entity |