Merge master

2017-10-21 21:12:56 -07:00
parent 42ed9616b5 77d25e1715
commit 4d53c4aa00
106 changed files with 1259 additions and 1044 deletions
--- a/server/api/auth.js
+++ b/server/api/auth.js
@ -55,6 +55,10 @@ router.post('auth.slack', async ctx => {
    expires: new Date('2100'),
  });

+  // Update user's avatar
+  await user.updateAvatar();
+  await user.save();
+
  ctx.body = {
    data: {
      user: await presentUser(ctx, user),