diff options
| author | Hannes Rosenögger <123haynes@gmail.com> | 2015-05-07 18:18:23 +0200 |
|---|---|---|
| committer | Hannes Rosenögger <123haynes@gmail.com> | 2015-05-07 18:18:23 +0200 |
| commit | 2a3c1d7cdda27c1365d62b5528b60b9f90e7d702 (patch) | |
| tree | f7fef9847914110999bfca6ae5d748283affb93b | |
| parent | 415648e2555e25d30f64f4c2642cf149f6965859 (diff) | |
| download | gitlab-ce-2a3c1d7cdda27c1365d62b5528b60b9f90e7d702.tar.gz | |
Fix commit time being displayed in the wrong timezone in some cases
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/helpers/application_helper.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 90e9d96e7ce..0261912da4f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 7.11.0 (unreleased) + - Fix commit time being displayed in the wrong timezone in some cases (Hannes Rosenögger) - Make the first branch pushed to an empty repository the default HEAD (Stan Hu) - Make Reply-To config apply to change e-mail confirmation and other Devise notifications (Stan Hu) - Add application setting to restrict user signups to e-mail domains (Stan Hu) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 6e86400a4f6..672be54e66f 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -214,7 +214,7 @@ module ApplicationHelper def time_ago_with_tooltip(date, placement = 'top', html_class = 'time_ago') capture_haml do haml_tag :time, date.to_s, - class: html_class, datetime: date.getutc.iso8601, title: date.stamp('Aug 21, 2011 9:23pm'), + class: html_class, datetime: date.getutc.iso8601, title: date.in_time_zone.stamp('Aug 21, 2011 9:23pm'), data: { toggle: 'tooltip', placement: placement } haml_tag :script, "$('." + html_class + "').timeago().tooltip()" |