root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2350 from Razer6/milestone-expiration-date 

Changed wording if milestone already expired
This commit is contained in:
Dmitriy Zaporozhets 2012-12-24 05:58:28 -08:00
parent efc4cae1b7 d62a8a4d50
commit c49a3106ff
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/models/milestone.rb
View File

@ -29,7 +29,7 @@ class Milestone < ActiveRecord::Base
def expired?
if due_date
due_date < Date.today
due_date.past?
else
false
end
@ -58,7 +58,13 @@ class Milestone < ActiveRecord::Base
end
def expires_at
"expires at #{due_date.stamp("Aug 21, 2011")}" if due_date
if due_date
if due_date.past?
"expired at #{due_date.stamp("Aug 21, 2011")}"
else
"expires at #{due_date.stamp("Aug 21, 2011")}"
end
end
end
def can_be_closed?