Merge remote-tracking branch 'origin/master'

This commit is contained in:
Andreas N 2015-02-03 14:57:44 +01:00
commit a509b34524
1 changed files with 2 additions and 2 deletions

View File

@ -2,11 +2,11 @@ class ScreenNameValidator < ActiveModel::EachValidator
FORBIDDEN_SCREEN_NAMES = %w(justask_admin retrospring_admin admin justask retrospring about public
notifications inbox sign_in sign_up sidekiq moderation moderator mod administrator
siteadmin site_admin help retro_spring retroospring retrosprlng niisding nllsding
group settings)
group settings search pixeidesu plxeldesu plxeidesu)
def validate_each(record, attribute, value)
if FORBIDDEN_SCREEN_NAMES.include? value.downcase
record.errors[attribute] << "Thou shalt not use this username! Please choose another one."
end
end
end
end