nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge

Browse source
This commit is contained in:
Raphael 2010-08-17 17:23:37 -07:00
parent fb84daf68a
commit 6f24a454c8
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/models/user.rb
View file

@ -22,7 +22,6 @@ class User
######## Making things work ######## ######## Making things work ########
key :email, String key :email, String
<<<<<<< HEAD
#validates_true_for :email, :logic => lambda {self.pivotal_email?} #validates_true_for :email, :logic => lambda {self.pivotal_email?}
@ -33,9 +32,7 @@ class User
def pivotal_or_diaspora_only def pivotal_or_diaspora_only
raise "pivotal only" unless allowed_email? raise "pivotal only" unless allowed_email?
end end
=======
ensure_index :email ensure_index :email
>>>>>>> bded53d51b1ca40e1c5c8f23fb28234849e14f78
def method_missing(method, *args) def method_missing(method, *args)
self.person.send(method, *args) self.person.send(method, *args)