Merge branch 'master' into user-sort

This commit is contained in:
Chi Vinh Le
2017-08-24 20:09:44 +07:00
18 changed files with 55 additions and 100 deletions
-7
View File
@@ -22,13 +22,6 @@ const User = {
}
},
created_at({roles, created_at}, _, {user}) {
if (user && user.can(SEARCH_OTHER_USERS)) {
return created_at;
}
return null;
},
comments({id}, {query}, {loaders: {Comments}, user}) {
// If the user is not an admin, only return comment list for the owner of
+1 -1
View File
@@ -79,7 +79,7 @@ type User {
username: String!
# creation date of user
created_at: String!
created_at: Date!
# Action summaries against the user.
action_summaries: [ActionSummary!]!