Merge branch 'master' of github.com:diaspora/diaspora

This commit is contained in:
danielvincent 2010-08-24 11:12:04 -07:00
commit 85c268b5eb
2 changed files with 4 additions and 6 deletions

View file

@ -30,10 +30,8 @@ class GroupsController < ApplicationController
end end
def show def show
@person_ids = @group.person_ids
@group = Group.first(:id => params[:id]) @group = Group.first(:id => params[:id])
@friends = @group.people
@posts = current_user.visible_posts( :by_members_of => @group ).paginate :order => 'created_at DESC' @posts = current_user.visible_posts( :by_members_of => @group ).paginate :order => 'created_at DESC'
end end