Skip to content
This repository has been archived by the owner on Mar 21, 2019. It is now read-only.

Commit

Permalink
fix rails missed merge line
Browse files Browse the repository at this point in the history
  • Loading branch information
phamdt committed Mar 4, 2016
1 parent 7b652a7 commit 6c2eccc
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions app/models/user.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ class User < ActiveRecord::Base
belongs_to :referrer, class_name: 'User', foreign_key: 'referrer_id'
has_many :referrals, class_name: 'User', foreign_key: 'referrer_id'

attr_accessible :email

validates :email, presence: true, uniqueness: true, format: {
with: /\w+([-+.']\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/i,
message: 'Invalid email format.'
Expand Down

0 comments on commit 6c2eccc

Please sign in to comment.