Revert "Merge remote branch 'upstream/master'"

This reverts commit 4bb5aeb34b, reversing
changes made to fb70dc8c99.
This commit is contained in:
Alec Leamas 2010-10-20 14:52:18 +02:00
parent c08121e6eb
commit 3faca8380b

View file

@ -64,7 +64,7 @@ class User
#after_create :seed_aspects #after_create :seed_aspects
before_destroy :unfriend_everyone, :remove_person before_destroy :unfriend_everyone, :remove_person, :remove_all_aspects
def strip_username def strip_username
if username.present? if username.present?
@ -436,4 +436,8 @@ class User
end end
} }
end end
def remove_all_aspects
aspects.destroy_all
end
end end