Merged conflicts

client/coral-admin/src/reducers/community.js

@@ -38,12 +38,14 @@ export default function community (state = initialState, action) {
       })
       .set('commenters', commenters); // Sets to normal array
   }
-  case SET_ROLE :
+  case SET_ROLE : {
     const commenters = state.get('commenters');
     const idx = commenters.findIndex(el => el.id === action.id);
 
     commenters[idx].roles[0] = action.role;
     return state.set('commenters', commenters.map(id => id));
+    return state.set('commenters', commenters);
+  }
   case SORT_UPDATE :
     return state
       .set('field', action.sort.field)

models/user.js

@@ -24,10 +24,9 @@ const UserSchema = new mongoose.Schema({
       required: true
     }
   }],
-	roles: {
-		type: [{ type: String, enum: ['admin', 'moderator'] }],
-
-	}
+  roles: {
+    type: [{type: String, enum: ['admin', 'moderator']}]
+  }
 }, {
   timestamps: {
     createdAt: 'created_at',