From e52e600a4dde328233d4b0c37e0b0e92be76bc95 Mon Sep 17 00:00:00 2001
From: Raphael <raphael@joindiaspora.com>
Date: Wed, 20 Oct 2010 09:52:03 -0700
Subject: [PATCH] Revert "Revert "Merge remote branch 'upstream/master'""
This reverts commit 3faca8380b5bac4ab9159d1777affda681ff9216.
---
app/models/user.rb | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/app/models/user.rb b/app/models/user.rb
index aee21b5438..cc9531c8c8 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -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
--
GitLab