Revert "Merge remote branch 'upstream/master'"
This reverts commit4bb5aeb34b, reversing changes made tofb70dc8c99.
This commit is contained in:
parent
c08121e6eb
commit
3faca8380b
1 changed files with 5 additions and 1 deletions
|
|
@ -64,7 +64,7 @@ class User
|
|||
|
||||
#after_create :seed_aspects
|
||||
|
||||
before_destroy :unfriend_everyone, :remove_person
|
||||
before_destroy :unfriend_everyone, :remove_person, :remove_all_aspects
|
||||
|
||||
def strip_username
|
||||
if username.present?
|
||||
|
|
@ -436,4 +436,8 @@ class User
|
|||
end
|
||||
}
|
||||
end
|
||||
|
||||
def remove_all_aspects
|
||||
aspects.destroy_all
|
||||
end
|
||||
end
|
||||
|
|
|
|||
Loading…
Reference in a new issue