Merge branch 'commit_time_timezone' into 'master'

Fix commit time being displayed in the wrong timezone in some cases This MR makes sure that the displayed commit date is shown in the timezone that's configured in the gitlab.yml. Before it was possible that the `committed_date` of a commit would display different values on the dashboard and the commit page. fixes gitlab-org/gitlab-ce#1278 /cc @DouweM See merge request !624

Merge branch 'commit_time_timezone' into 'master'
f84e78f3 · Douwe Maan · 9694c816 · 2a3c1d7c · f84e78f3 · f84e78f3
Commit f84e78f3 authored May 12, 2015 by Douwe Maan
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

CHANGELOG CHANGELOG +1 -0

application_helper.rb app/helpers/application_helper.rb +1 -1

No files found.
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@ Please view this file on the master branch, on stable branches it's out of date.

 v 7.11.0 (unreleased)
  - Don't show duplicate deploy keys
+  - 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)

--- 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()"