gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge 72c4e9f24c into 80a9544279

Browse source
This commit is contained in:
Rahul 2017-08-01 08:30:31 +00:00 • committed by GitHub
commit 8c967a9f6b
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/models/user.rb
View file

@ -64,7 +64,8 @@ class User < ActiveRecord::Base
scope :admin, -> { where(is_admin: true) } scope :admin, -> { where(is_admin: true) }
scope :active, -> { where(is_disabled: false) } scope :active, -> { where(is_disabled: false) }
validates :email, presence: true VALID_EMAIL_REGEX = /\A([\w+\-].?)+@[a-z\d\-]+(\.[a-z]+)*\.[a-z]+\z/i
validates :email, presence: true, format: {with: VALID_EMAIL_REGEX }
validates :username, validates :username,
uniqueness: { uniqueness: {