From 6f24a454c8e51c024b7bd79587ba6101e4b4bc0c Mon Sep 17 00:00:00 2001 From: Raphael Date: Tue, 17 Aug 2010 17:23:37 -0700 Subject: [PATCH] merge --- app/models/user.rb | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index 8c116d883..dbcb03526 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -22,7 +22,6 @@ class User ######## Making things work ######## key :email, String -<<<<<<< HEAD #validates_true_for :email, :logic => lambda {self.pivotal_email?} @@ -33,9 +32,7 @@ class User def pivotal_or_diaspora_only raise "pivotal only" unless allowed_email? end -======= ensure_index :email ->>>>>>> bded53d51b1ca40e1c5c8f23fb28234849e14f78 def method_missing(method, *args) self.person.send(method, *args)