summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2015-07-09 15:29:14 +0000
committerStan Hu <stanhu@gmail.com>2015-07-09 15:29:14 +0000
commitadd283bf685141b6ce6e41045c4c592fc3fd5b44 (patch)
tree391f6f0216ddfbcffd5aec21877cad1ea97f6221 /lib
parent36f3e2062ded8b8b64cc5b724258e1ce95348ef5 (diff)
parentdd4fee5fdbda07fbc09234c4b043c3c9939a6a9b (diff)
downloadgitlab-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
Diffstat (limited to 'lib')
-rw-r--r--lib/api/entities.rb3
1 files changed, 3 insertions, 0 deletions
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