summaryrefslogtreecommitdiff
path: root/app/helpers/timeboxes_helper.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-01-18 19:00:14 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2023-01-18 19:00:14 +0000
commit05f0ebba3a2c8ddf39e436f412dc2ab5bf1353b2 (patch)
tree11d0f2a6ec31c7793c184106cedc2ded3d9a2cc5 /app/helpers/timeboxes_helper.rb
parentec73467c23693d0db63a797d10194da9e72a74af (diff)
downloadgitlab-ce-05f0ebba3a2c8ddf39e436f412dc2ab5bf1353b2.tar.gz
Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42
Diffstat (limited to 'app/helpers/timeboxes_helper.rb')
-rw-r--r--app/helpers/timeboxes_helper.rb14
1 files changed, 13 insertions, 1 deletions
diff --git a/app/helpers/timeboxes_helper.rb b/app/helpers/timeboxes_helper.rb
index 307f03e0d64..66c9011fbcc 100644
--- a/app/helpers/timeboxes_helper.rb
+++ b/app/helpers/timeboxes_helper.rb
@@ -8,7 +8,7 @@ module TimeboxesHelper
if milestone.closed?
_('Closed')
elsif milestone.expired?
- _('Past due')
+ _('Expired')
elsif milestone.upcoming?
_('Upcoming')
else
@@ -16,6 +16,18 @@ module TimeboxesHelper
end
end
+ def milestone_badge_variant(milestone)
+ if milestone.closed?
+ :danger
+ elsif milestone.expired?
+ :warning
+ elsif milestone.upcoming?
+ :neutral
+ else
+ :success
+ end
+ end
+
def milestones_filter_path(opts = {})
if @project
project_milestones_path(@project, opts)