nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'production' of github.com:diaspora/diaspora into production

Browse source 
Conflicts:
	app/models/user.rb
This commit is contained in:
Raphael 2010-09-15 17:25:14 -07:00
commit 04594d7ac5
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/models/user.rb
View file

@ -229,7 +229,6 @@ class User
Rails.logger.info( "the person id is #{object.post_id} the friend found is #{visible_person_by_id(object.post_id).inspect}") Rails.logger.info( "the person id is #{object.post_id} the friend found is #{visible_person_by_id(object.post_id).inspect}")
unfriended_by visible_person_by_id(object.post_id) unfriended_by visible_person_by_id(object.post_id)
else else
object.perform self.id object.perform self.id
aspects = self.aspects_with_person(object.person) aspects = self.aspects_with_person(object.person)