diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-07-08 21:42:29 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-07-08 21:42:29 +0000 |
| commit | 27a9ff8264ff45a3753dd64ff4af62c121ff7f0b (patch) | |
| tree | 6b8b06f7fdec0610807c9beab80fbda24be6fddf /app/helpers | |
| parent | 512bb5ba285ed02db97d51d439cc81d9bd08a03d (diff) | |
| parent | 098ced4faad8d1048d6735f5b3ad6da6aa49fcfe (diff) | |
| download | gitlab-ce-27a9ff8264ff45a3753dd64ff4af62c121ff7f0b.tar.gz | |
Merge branch 'rs-dev-issue-2372' into 'master'
Filter by issues/merge requests without a milestone
Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2372
See merge request !886
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/milestones_helper.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/helpers/milestones_helper.rb b/app/helpers/milestones_helper.rb index 93e33ebefd8..132a893e532 100644 --- a/app/helpers/milestones_helper.rb +++ b/app/helpers/milestones_helper.rb @@ -29,6 +29,8 @@ module MilestonesHelper end.active grouped_milestones = Milestones::GroupService.new(milestones).execute + grouped_milestones.unshift(Milestone::None) + options_from_collection_for_select(grouped_milestones, 'title', 'title', params[:milestone_title]) end end |