summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMario de la Ossa <mariodelaossa@gmail.com>2018-05-21 21:10:47 -0600
committerMario de la Ossa <mariodelaossa@gmail.com>2018-05-21 21:10:47 -0600
commitf994c78cde234a2b823bfc305f2c2a0b41622811 (patch)
treead8c4ba6675c7f1103ff946ad97151d79e5bb015
parentcc73549b4a48d4b3d97beb29ed49185a1d1df896 (diff)
downloadgitlab-ce-ee-5941-extract-ee-controllers.tar.gz
Backport changes to app/controllers/groups/milestones_controller.rbee-5941-extract-ee-controllers
-rw-r--r--app/controllers/groups/milestones_controller.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/app/controllers/groups/milestones_controller.rb b/app/controllers/groups/milestones_controller.rb
index 5903689dc62..9bd51de7e97 100644
--- a/app/controllers/groups/milestones_controller.rb
+++ b/app/controllers/groups/milestones_controller.rb
@@ -76,12 +76,15 @@ class Groups::MilestonesController < Groups::ApplicationController
def milestones
milestones = MilestonesFinder.new(search_params).execute
- legacy_milestones = GroupMilestone.build_collection(group, group_projects, params)
@sort = params[:sort] || 'due_date_asc'
MilestoneArray.sort(milestones + legacy_milestones, @sort)
end
+ def legacy_milestones
+ GroupMilestone.build_collection(group, group_projects, params)
+ end
+
def milestone
@milestone =
if params[:title]