Commit d3b7633d authored by tiagonbotelho's avatar tiagonbotelho

fixes small issues

parent b94bdb69
......@@ -36,7 +36,6 @@ v 8.5.5
- 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
- Do not cache requests for badges (including builds badge)
......
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment