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

1 files changed, 4 insertions, 2 deletions

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