diff options
| author | George Andrinopoulos <geoandri@gmail.com> | 2017-11-06 19:51:24 +0200 |
|---|---|---|
| committer | George Andrinopoulos <geoandri@gmail.com> | 2017-11-07 06:37:46 +0200 |
| commit | f4ed780ef5fc76b7704742d4886ac435c3e5ab98 (patch) | |
| tree | 7536ed460f72156638203606ce20dadff5305468 /app/controllers/groups | |
| parent | bba020a56cbedd6403b637ec7f9eaee258eb7c67 (diff) | |
| download | gitlab-ce-f4ed780ef5fc76b7704742d4886ac435c3e5ab98.tar.gz | |
Add Group Milestone sorting
Diffstat (limited to 'app/controllers/groups')
| -rw-r--r-- | app/controllers/groups/milestones_controller.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/groups/milestones_controller.rb b/app/controllers/groups/milestones_controller.rb index 7a7bcb1a3d2..f013d21275e 100644 --- a/app/controllers/groups/milestones_controller.rb +++ b/app/controllers/groups/milestones_controller.rb @@ -80,7 +80,8 @@ class Groups::MilestonesController < Groups::ApplicationController milestones = MilestonesFinder.new(search_params).execute legacy_milestones = GroupMilestone.build_collection(group, group_projects, params) - milestones + legacy_milestones + @sort = params[:sort] || 'due_date_asc' + MilestoneArray.sort(milestones + legacy_milestones, @sort) end def milestone |