summaryrefslogtreecommitdiff
path: root/app/models/milestone.rb
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2016-01-06 17:27:56 -0500
committerRobert Speicher <rspeicher@gmail.com>2016-01-07 20:01:08 -0500
commitfa36749bcee7fa2eb72c9f2a6a28aab1b7274097 (patch)
treece7eb20119e69fac8cb41f35dd059599b4e71817 /app/models/milestone.rb
parent59305715e9d3569f47d7c2accc2106022c0a6960 (diff)
downloadgitlab-ce-fa36749bcee7fa2eb72c9f2a6a28aab1b7274097.tar.gz
Add two custom Date/Time conversion formats
Diffstat (limited to 'app/models/milestone.rb')
-rw-r--r--app/models/milestone.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/milestone.rb b/app/models/milestone.rb
index 5f920132da9..c9a0ad8b9b6 100644
--- a/app/models/milestone.rb
+++ b/app/models/milestone.rb
@@ -112,9 +112,9 @@ class Milestone < ActiveRecord::Base
def expires_at
if due_date
if due_date.past?
- "expired at #{due_date.strftime('%b %-d, %Y')}"
+ "expired on #{due_date.to_s(:medium)}"
else
- "expires at #{due_date.strftime('%b %-d, %Y')}"
+ "expires on #{due_date.to_s(:medium)}"
end
end
end