diff options
author | Jacob Schatz <jschatz@gitlab.com> | 2017-03-05 16:15:25 +0000 |
---|---|---|
committer | Jacob Schatz <jschatz@gitlab.com> | 2017-03-05 16:15:25 +0000 |
commit | 97330be9a52f84b2ced5b80a68e4a5bee47870ed (patch) | |
tree | 6c8aa5f6908644bac40f315e48cc72ef2ad838a5 /app | |
parent | 9f59101fb980dc264105814455d2553dde4fd174 (diff) | |
parent | a9c80dceb688623e8f06a925caf629fddfa180ec (diff) | |
download | gitlab-ce-97330be9a52f84b2ced5b80a68e4a5bee47870ed.tar.gz |
Merge branch 'format-timeago-date' into 'master'
Formats timeago dates to be more friendly
Closes #27537
See merge request !9145
Diffstat (limited to 'app')
-rw-r--r-- | app/helpers/application_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 70419eb4bde..a3213581498 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -167,7 +167,7 @@ module ApplicationHelper css_classes = short_format ? 'js-short-timeago' : 'js-timeago' css_classes << " #{html_class}" unless html_class.blank? - element = content_tag :time, time.to_s, + element = content_tag :time, time.strftime("%b %d, %Y"), class: css_classes, title: time.to_time.in_time_zone.to_s(:medium), datetime: time.to_time.getutc.iso8601, |