summaryrefslogtreecommitdiff
path: root/app/helpers/issuables_helper.rb
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2017-03-10 19:01:05 +0000
committerSean McGivern <sean@gitlab.com>2017-03-15 17:02:38 +0000
commit03dabc522e937f091ad30cc40034ffd6d19c7011 (patch)
tree683abccc734faf19b6f630ac8e26d8c50a9e64b2 /app/helpers/issuables_helper.rb
parent101fddfa9203fbcc96151e880a3a1241338a91f2 (diff)
downloadgitlab-ce-03dabc522e937f091ad30cc40034ffd6d19c7011.tar.gz
Allow filtering by all started milestonesbetter-priority-sorting
Diffstat (limited to 'app/helpers/issuables_helper.rb')
-rw-r--r--app/helpers/issuables_helper.rb11
1 files changed, 7 insertions, 4 deletions
diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb
index aad83731b87..a777db2826b 100644
--- a/app/helpers/issuables_helper.rb
+++ b/app/helpers/issuables_helper.rb
@@ -90,11 +90,14 @@ module IssuablesHelper
end
def milestone_dropdown_label(milestone_title, default_label = "Milestone")
- if milestone_title == Milestone::Upcoming.name
- milestone_title = Milestone::Upcoming.title
- end
+ title =
+ case milestone_title
+ when Milestone::Upcoming.name then Milestone::Upcoming.title
+ when Milestone::Started.name then Milestone::Started.title
+ else milestone_title.presence
+ end
- h(milestone_title.presence || default_label)
+ h(title || default_label)
end
def to_url_reference(issuable)