From 4f5ee68f09672d08a4e3997a771e062f56665dab Mon Sep 17 00:00:00 2001
From: Fatih Acet <acetfatih@gmail.com>
Date: Wed, 8 Jun 2016 18:41:03 +0300
Subject: [PATCH] Copy changes for milestone due dates.
---
app/assets/javascripts/lib/common_utils.js.coffee | 2 +-
app/helpers/milestones_helper.rb | 2 +-
app/views/projects/milestones/show.html.haml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app/assets/javascripts/lib/common_utils.js.coffee b/app/assets/javascripts/lib/common_utils.js.coffee
index a7cc07608ab..0000e99a650 100644
--- a/app/assets/javascripts/lib/common_utils.js.coffee
+++ b/app/assets/javascripts/lib/common_utils.js.coffee
@@ -5,7 +5,7 @@
return '' unless time
suffix or= 'remaining'
- expiredLabel or= 'expired'
+ expiredLabel or= 'Past due'
jQuery.timeago.settings.allowFuture = yes
diff --git a/app/helpers/milestones_helper.rb b/app/helpers/milestones_helper.rb
index 87fc2db6901..e28ca13ec23 100644
--- a/app/helpers/milestones_helper.rb
+++ b/app/helpers/milestones_helper.rb
@@ -56,7 +56,7 @@ module MilestonesHelper
def milestone_remaining_days(milestone)
if milestone.expired?
- content_tag(:strong, 'expired')
+ content_tag(:strong, 'Past Due')
elsif milestone.due_date
days = milestone.remaining_days
content = content_tag(:strong, days)
diff --git a/app/views/projects/milestones/show.html.haml b/app/views/projects/milestones/show.html.haml
index 19944e3e023..58b1f8f664f 100644
--- a/app/views/projects/milestones/show.html.haml
+++ b/app/views/projects/milestones/show.html.haml
@@ -6,7 +6,7 @@
- if @milestone.closed?
Closed
- elsif @milestone.expired?
- Expired
+ Past Due
- else
Open
%span.identifier
--
GitLab