Commit 75eb0416 authored by Rémy Coutable's avatar Rémy Coutable
Browse files

Merge branch '38495-calendar-activities-in-timezone' into 'master'

Show user contributions in correct timezone within user profile

Closes #38495

See merge request gitlab-org/gitlab-ce!23419
parents f912e3b1 8183c919
......@@ -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}
......
---
title: Show user contributions in correct timezone within user profile
merge_request: 23419
author:
type: changed
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment