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-06-04 13:49:38 -0600 |
| commit | fd97b86ed48b559332be4ba4ee7e8b6f9e7a6bf3 (patch) | |
| tree | 045ed72a1f409a384b69a046f41b54b76e372e83 | |
| parent | 4dbd28eea455528abf351de980e3d878bedaf52e (diff) | |
| download | gitlab-ce-5941-extract-ee-controllers.tar.gz | |
Backport changes to app/controllers/groups/milestones_controller.rb5941-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] |