Defaults milestone filter to upcoming

1 files changed, 6 insertions, 2 deletions

diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb
index 47d174361db..7ebb8b77793 100644
--- a/app/helpers/issuables_helper.rb
+++ b/app/helpers/issuables_helper.rb
@@ -49,12 +49,16 @@ module IssuablesHelper
     end
   end
 
-  def milestone_dropdown_label(milestone_title, default_label = "Milestone")
+  def milestone_dropdown_label(milestone_title, is_boards, default_label = "Milestone")
     if milestone_title == Milestone::Upcoming.name
       milestone_title = Milestone::Upcoming.title
     end
 
-    h(milestone_title.presence || default_label)
+    if is_boards
+      boards_default = Milestone::Upcoming.title
+    end
+
+    h(milestone_title.presence || boards_default || default_label)
   end
 
   def issuable_meta(issuable, project, text)