Merge remote branch 'upstream/master'

This commit is contained in:
Alec Leamas 2010-10-20 08:55:35 +02:00
commit 4bb5aeb34b

View file

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