summaryrefslogtreecommitdiff
path: root/app/helpers
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-08-12 10:24:50 +0100
committerPhil Hughes <me@iamphill.com>2016-08-17 17:17:39 +0100
commitcd6c3adf3e7cb84e802fe64b7a663015b694fecd (patch)
treea356b734ff3c5b426a11c99b966126f03851b29e /app/helpers
parentf4c9d514f9426e032f9fa236de147dc4deec73c8 (diff)
downloadgitlab-ce-cd6c3adf3e7cb84e802fe64b7a663015b694fecd.tar.gz
Reverted milestone upcoming default filter
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/issuables_helper.rb8
1 files changed, 2 insertions, 6 deletions
diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb
index 7ebb8b77793..47d174361db 100644
--- a/app/helpers/issuables_helper.rb
+++ b/app/helpers/issuables_helper.rb
@@ -49,16 +49,12 @@ module IssuablesHelper
end
end
- def milestone_dropdown_label(milestone_title, is_boards, default_label = "Milestone")
+ def milestone_dropdown_label(milestone_title, default_label = "Milestone")
if milestone_title == Milestone::Upcoming.name
milestone_title = Milestone::Upcoming.title
end
- if is_boards
- boards_default = Milestone::Upcoming.title
- end
-
- h(milestone_title.presence || boards_default || default_label)
+ h(milestone_title.presence || default_label)
end
def issuable_meta(issuable, project, text)