Merge branch 'master' into 142993479-tags

This commit is contained in:
Wyatt Johnson
2017-05-12 07:49:02 -06:00
45 changed files with 1776 additions and 615 deletions
-3
View File
@@ -170,9 +170,6 @@ describe('services.UsersService', () => {
});
describe('#ignoreUser', () => {
// @TODO: assert cannot ignore yourself
it('should add user id to ignoredUsers set', async () => {
const user = mockUsers[0];
const usersToIgnore = [mockUsers[1], mockUsers[2]];