diff options
| author | Robert Schilling <rschilling@student.tugraz.at> | 2015-05-03 15:00:58 +0200 |
|---|---|---|
| committer | Robert Schilling <rschilling@student.tugraz.at> | 2015-05-03 15:00:58 +0200 |
| commit | 78da7b1c486cb5c07a51e727a497e882bea4bc55 (patch) | |
| tree | 5ae1364af111f97504f254a8469f04553a1c9169 /app/helpers | |
| parent | 5f3eef6e56ac4908c3fc67ca238340a3caf5a9b8 (diff) | |
| parent | 747232eeda7c79ea65a5c208399a6c72872ff4bc (diff) | |
| download | gitlab-ce-78da7b1c486cb5c07a51e727a497e882bea4bc55.tar.gz | |
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/milestones_helper.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/helpers/milestones_helper.rb b/app/helpers/milestones_helper.rb index 282bdf744d2..93e33ebefd8 100644 --- a/app/helpers/milestones_helper.rb +++ b/app/helpers/milestones_helper.rb @@ -28,6 +28,7 @@ module MilestonesHelper Milestone.where(project_id: @projects) end.active - options_from_collection_for_select(milestones, 'id', 'title', params[:milestone_id]) + grouped_milestones = Milestones::GroupService.new(milestones).execute + options_from_collection_for_select(grouped_milestones, 'title', 'title', params[:milestone_title]) end end |