Commit 7d1c0679 authored by Stan Hu's avatar Stan Hu

Merge branch 'note-query-information' into 'master'

Note query information

See merge request !1149
parents e956d116 95f8f7c7
...@@ -360,6 +360,10 @@ class Note < ActiveRecord::Base ...@@ -360,6 +360,10 @@ class Note < ActiveRecord::Base
create_new_cross_references!(project, author) create_new_cross_references!(project, author)
end end
def system?
read_attribute(:system)
end
def editable? def editable?
!read_attribute(:system) !read_attribute(:system)
end end
......
...@@ -31,7 +31,10 @@ Parameters: ...@@ -31,7 +31,10 @@ Parameters:
"state": "active", "state": "active",
"created_at": "2013-09-30T13:46:01Z" "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, "id": 305,
...@@ -45,7 +48,10 @@ Parameters: ...@@ -45,7 +48,10 @@ Parameters:
"state": "active", "state": "active",
"created_at": "2013-09-30T13:46:01Z" "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
} }
] ]
``` ```
......
...@@ -205,6 +205,9 @@ module API ...@@ -205,6 +205,9 @@ module API
expose :attachment_identifier, as: :attachment expose :attachment_identifier, as: :attachment
expose :author, using: Entities::UserBasic expose :author, using: Entities::UserBasic
expose :created_at expose :created_at
expose :system?, as: :system
expose :upvote?, as: :upvote
expose :downvote?, as: :downvote
end end
class MRNote < Grape::Entity class MRNote < Grape::Entity
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment