Merge remote-tracking branch 'origin/groups' into groups

This commit is contained in:
Andreas N 2015-01-17 19:15:15 +01:00
commit 1f73b3e3fa
1 changed files with 1 additions and 1 deletions

View File

@ -3,6 +3,6 @@ class GroupController < ApplicationController
def index def index
@group = current_user.groups.find_by_name!(params[:group_name]) @group = current_user.groups.find_by_name!(params[:group_name])
@timeline = group.timeline.paginate(page: params[:page]) @timeline = @group.timeline.paginate(page: params[:page])
end end
end end