fixes small issues

2016-03-13 12:19:27 +00:00 · 2016-03-13 12:19:27 +00:00 · d3b7633da4
parent b94bdb698d
commit d3b7633da4
2 changed files with 2 additions and 3 deletions
--- a/1
+++ b/1
@ -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
--- 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