BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit 4f5ee68f by Fatih Acet
Options

Copy changes for milestone due dates.

parent b868b814
Showing with 3 additions and 3 deletions
app/assets/javascripts/lib/common_utils.js.coffee
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
return '' unless time return '' unless time
suffix or= 'remaining' suffix or= 'remaining'
expiredLabel or= 'expired' expiredLabel or= 'Past due'
jQuery.timeago.settings.allowFuture = yes jQuery.timeago.settings.allowFuture = yes
......
app/helpers/milestones_helper.rb
...@@ -56,7 +56,7 @@ module MilestonesHelper ...@@ -56,7 +56,7 @@ module MilestonesHelper
def milestone_remaining_days(milestone) def milestone_remaining_days(milestone)
if milestone.expired? if milestone.expired?
content_tag(:strong, 'expired') content_tag(:strong, 'Past Due')
elsif milestone.due_date elsif milestone.due_date
days = milestone.remaining_days days = milestone.remaining_days
content = content_tag(:strong, days) content = content_tag(:strong, days)
......
app/views/projects/milestones/show.html.haml
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
- if @milestone.closed? - if @milestone.closed?
Closed Closed
- elsif @milestone.expired? - elsif @milestone.expired?
Expired Past Due
- else - else
Open Open
%span.identifier %span.identifier
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment