Commit 3f5a4ae5 authored by Stan Hu's avatar Stan Hu

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

Revert "api: add 'system', 'upvote', and 'downvote' fields to note queries"

This reverts commit dd4fee5f.

See merge request !950
parents add283bf 4c586dc7
...@@ -31,10 +31,7 @@ Parameters: ...@@ -31,10 +31,7 @@ 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,
...@@ -48,10 +45,7 @@ Parameters: ...@@ -48,10 +45,7 @@ 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
} }
] ]
``` ```
......
...@@ -190,9 +190,6 @@ module API ...@@ -190,9 +190,6 @@ 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
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