Merge branch 'master' into email-verification

This commit is contained in:
Wyatt Johnson
2017-10-18 09:34:32 -06:00
committed by GitHub
25 changed files with 430 additions and 211 deletions
+8 -1
View File
@@ -208,12 +208,19 @@ const ErrMaxRateLimit = new APIError('Rate limit exeeded', {
status: 429,
});
// ErrCannotIgnoreStaff is returned when a user tries to ignore a staff member.
const ErrCannotIgnoreStaff = new APIError('Cannot ignore staff members.', {
translation_key: 'CANNOT_IGNORE_STAFF',
status: 400,
});
module.exports = {
APIError,
ErrAlreadyExists,
ErrAssetCommentingClosed,
ErrAssetURLAlreadyExists,
ErrAuthentication,
ErrCannotIgnoreStaff,
ErrCommentTooShort,
ErrContainsProfanity,
ErrEditWindowHasEnded,
@@ -237,4 +244,4 @@ module.exports = {
ErrSpecialChars,
ErrUsernameTaken,
ExtendableError,
};
};