diff options
| author | Mario de la Ossa <mariodelaossa@gmail.com> | 2018-05-21 21:10:47 -0600 |
|---|---|---|
| committer | Mario de la Ossa <mariodelaossa@gmail.com> | 2018-05-23 13:39:10 -0600 |
| commit | a0d6f43b26229f9ececdf343a96008eaf5c4a35d (patch) | |
| tree | a28af69ad8ba160fb5d07cbb892f78c6b268d7e6 | |
| parent | b2d4e157f3163347f1db7d76c5eebc436bb10b35 (diff) | |
| download | gitlab-ce-ce-5941-extract-ee-controllers.tar.gz | |
Backport changes to app/controllers/groups/milestones_controller.rbce-5941-extract-ee-controllers
| -rw-r--r-- | app/controllers/groups/milestones_controller.rb | 5 |
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] |