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