diff options
Diffstat (limited to 'app/controllers/groups/milestones_controller.rb')
| -rw-r--r-- | app/controllers/groups/milestones_controller.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/controllers/groups/milestones_controller.rb b/app/controllers/groups/milestones_controller.rb index 43382886031..420ac51f11e 100644 --- a/app/controllers/groups/milestones_controller.rb +++ b/app/controllers/groups/milestones_controller.rb @@ -64,11 +64,10 @@ class Groups::MilestonesController < Groups::ApplicationController end def milestones - @group_milestones = GroupMilestone.all - @project_milestones = Milestone.where(project_id: group.projects.pluck(:id)) + @group_milestones = GroupMilestonesFinder.new(group, params).execute + @project_milestones = ProjectMilestonesFinder.new(@projects, params).execute @group_milestones + @project_milestones - #@milestones = GroupMilestone.build_collection(@group, @projects, params) end def milestone |