diff options
| author | tiagonbotelho <tiagonbotelho@hotmail.com> | 2016-03-13 12:19:27 +0000 |
|---|---|---|
| committer | tiagonbotelho <tiagonbotelho@hotmail.com> | 2016-03-13 12:19:27 +0000 |
| commit | d3b7633da4a3964eb4609c7591763aa8e43fd0eb (patch) | |
| tree | 7ed4ae2d48074f2bca65e97a7880204b0250a78b | |
| parent | b94bdb698dedb519a8478440a3dc8a763856b6a0 (diff) | |
| download | gitlab-ce-d3b7633da4a3964eb4609c7591763aa8e43fd0eb.tar.gz | |
fixes small issues
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/finders/issuable_finder.rb | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG index 2535a78af48..b7bc48802d3 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -35,7 +35,6 @@ v 8.5.5 - Prevent a 500 error in Todos when author was removed - Fix pagination for filtered dashboard and explore pages - Fix "Show all" link behavior - - Add #upcoming filter to Milestone filter (Tiago Botelho) - Add #upcoming filter to Milestone filter (Tiago Botelho) v 8.5.4 diff --git a/app/finders/issuable_finder.rb b/app/finders/issuable_finder.rb index 5e22aca45f7..19e8c7a92be 100644 --- a/app/finders/issuable_finder.rb +++ b/app/finders/issuable_finder.rb @@ -244,7 +244,7 @@ class IssuableFinder items end - def upcoming? + def filter_by_upcoming_milestone? params[:milestone_title] == '#upcoming' end @@ -252,7 +252,7 @@ class IssuableFinder if milestones? if filter_by_no_milestone? items = items.where(milestone_id: [-1, nil]) - elsif upcoming? + elsif filter_by_upcoming_milestone? upcoming = Milestone.where(project_id: projects).upcoming items = items.joins(:milestone).where(milestones: { title: upcoming.title }) else |