Merge remote-tracking branch 'origin/groups' into groups
This commit is contained in:
commit
1f73b3e3fa
|
@ -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
|
||||||
|
|
Loading…
Reference in New Issue