summaryrefslogtreecommitdiff
path: root/app/helpers/application_helper.rb
diff options
context:
space:
mode:
authorHannes Rosenögger <123haynes@gmail.com>2015-05-07 18:18:23 +0200
committerHannes Rosenögger <123haynes@gmail.com>2015-05-07 18:18:23 +0200
commit2a3c1d7cdda27c1365d62b5528b60b9f90e7d702 (patch)
treef7fef9847914110999bfca6ae5d748283affb93b /app/helpers/application_helper.rb
parent415648e2555e25d30f64f4c2642cf149f6965859 (diff)
downloadgitlab-ce-2a3c1d7cdda27c1365d62b5528b60b9f90e7d702.tar.gz
Fix commit time being displayed in the wrong timezone in some cases
Diffstat (limited to 'app/helpers/application_helper.rb')
-rw-r--r--app/helpers/application_helper.rb2
1 files changed, 1 insertions, 1 deletions
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()"