From 8183c919a86196bff8289ad010205492d0a8e9ce Mon Sep 17 00:00:00 2001 From: Kushal Pandya Date: Wed, 28 Nov 2018 17:43:34 +0000 Subject: [PATCH] Show user contributions in correct timezone within user profile --- app/views/users/calendar_activities.html.haml | 2 +- .../unreleased/38495-calendar-activities-in-timezone.yml | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 changelogs/unreleased/38495-calendar-activities-in-timezone.yml 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} diff --git a/changelogs/unreleased/38495-calendar-activities-in-timezone.yml b/changelogs/unreleased/38495-calendar-activities-in-timezone.yml new file mode 100644 index 00000000000..778d637609c --- /dev/null +++ b/changelogs/unreleased/38495-calendar-activities-in-timezone.yml @@ -0,0 +1,5 @@ +--- +title: Show user contributions in correct timezone within user profile +merge_request: 23419 +author: +type: changed