From 1da3b9dce82dec706863dc8d205d6dc365c19f88 Mon Sep 17 00:00:00 2001 From: Robert Speicher Date: Fri, 5 Jan 2018 17:54:29 +0000 Subject: Merge branch 'milestones-finder-order-fix-10-1' into 'security-10-1' Remove order param from the MilestoneFinder - 10.1 port See merge request gitlab/gitlabhq!2265 (cherry picked from commit 5f0bb7928b40029a2ced18063c36697e3f8e80c2) 85c6530e Remove order param from the MilestoneFinder --- app/controllers/groups/milestones_controller.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'app/controllers/groups/milestones_controller.rb') diff --git a/app/controllers/groups/milestones_controller.rb b/app/controllers/groups/milestones_controller.rb index 7a7bcb1a3d2..310aeb0f0d6 100644 --- a/app/controllers/groups/milestones_controller.rb +++ b/app/controllers/groups/milestones_controller.rb @@ -75,8 +75,6 @@ class Groups::MilestonesController < Groups::ApplicationController end def milestones - search_params = params.merge(group_ids: group.id) - milestones = MilestonesFinder.new(search_params).execute legacy_milestones = GroupMilestone.build_collection(group, group_projects, params) @@ -93,4 +91,8 @@ class Groups::MilestonesController < Groups::ApplicationController render_404 unless @milestone end + + def search_params + params.permit(:state).merge(group_ids: group.id) + end end -- cgit v1.2.3