Merge branch 'master' into 138617379_best_comments

This commit is contained in:
Wyatt Johnson
2017-03-01 09:43:44 -07:00
committed by GitHub
28 changed files with 447 additions and 137 deletions
+6
View File
@@ -149,6 +149,9 @@ input CommentCountQuery {
# Comment is the base representation of user interaction in Talk.
type Comment {
# The parent of the comment (if there is one).
parent: Comment
# The ID of the comment.
id: ID!
@@ -477,6 +480,9 @@ type RootQuery {
# Site wide settings and defaults.
settings: Settings
# Finds a specific comment based on it's id.
comment(id: ID!): Comment
# All assets. Requires the `ADMIN` role.
assets: [Asset]