BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit c49a3106 by Dmitriy Zaporozhets
Options

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

Changed wording if milestone already expired
parents efc4cae1 d62a8a4d
Showing with 8 additions and 2 deletions
app/models/milestone.rb
...@@ -29,7 +29,7 @@ class Milestone < ActiveRecord::Base ...@@ -29,7 +29,7 @@ class Milestone < ActiveRecord::Base
def expired? def expired?
if due_date if due_date
due_date < Date.today due_date.past?
else else
false false
end end
...@@ -58,7 +58,13 @@ class Milestone < ActiveRecord::Base ...@@ -58,7 +58,13 @@ class Milestone < ActiveRecord::Base
end end
def expires_at 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 end
def can_be_closed? def can_be_closed?
......
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