Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKushal Pandya <kushalspandya@gmail.com>2018-11-28 20:43:34 +0300
committerRémy Coutable <remy@rymai.me>2018-11-28 20:43:34 +0300
commit8183c919a86196bff8289ad010205492d0a8e9ce (patch)
tree712e88daad87d951ca699f8f22e7e16ff22e7e28 /app/views/users/calendar_activities.html.haml
parentf912e3b1b2516be895ff51ca436d16e7747ccc3e (diff)
Show user contributions in correct timezone within user profile
Diffstat (limited to 'app/views/users/calendar_activities.html.haml')
-rw-r--r--app/views/users/calendar_activities.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/users/calendar_activities.html.haml b/app/views/users/calendar_activities.html.haml
index 938cb579e9f..01acbf8eadd 100644
--- a/app/views/users/calendar_activities.html.haml
+++ b/app/views/users/calendar_activities.html.haml
@@ -7,7 +7,7 @@
%li
%span.light
%i.fa.fa-clock-o
- = event.created_at.strftime('%-I:%M%P')
+ = event.created_at.to_time.in_time_zone.strftime('%-I:%M%P')
- if event.visible_to_user?(current_user)
- if event.push?
#{event.action_name} #{event.ref_type}