From 6c2eccc214b031520ee433b74c128951c137e23c Mon Sep 17 00:00:00 2001 From: danny pham Date: Fri, 4 Mar 2016 00:07:11 -0800 Subject: [PATCH] fix rails missed merge line --- app/models/user.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index 1a1968ae3..540e08544 100755 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -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.'