Merge branch 'master' into csrf

This commit is contained in:
gaba
2016-12-22 14:23:01 -08:00
56 changed files with 1802 additions and 7840 deletions
+2 -3
View File
@@ -170,12 +170,11 @@ router.put('/:user_id/bio', (req, res, next) => {
router.post('/:user_id/actions', parseForm, csrfProtection, authorization.needed(), (req, res, next) => {
const {
action_type,
field,
detail
metadata
} = req.body;
User
.addAction(req.params.user_id, req.user.id, action_type, field, detail)
.addAction(req.params.user_id, req.user.id, action_type, metadata)
.then((action) => {
res.status(201).json(action);
})