diff options
Diffstat (limited to 'app/views/users/calendar_activities.html.haml')
| -rw-r--r-- | app/views/users/calendar_activities.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/users/calendar_activities.html.haml b/app/views/users/calendar_activities.html.haml index 2f44a57c388..cffeb55597f 100644 --- a/app/views/users/calendar_activities.html.haml +++ b/app/views/users/calendar_activities.html.haml @@ -5,9 +5,9 @@ %ul.bordered-list - @events.sort_by(&:created_at).each do |event| %li - %span.light + %span.light.js-localtime{ :data => { :datetime => event.created_at.utc.strftime('%Y-%m-%dT%H:%M:%SZ'), :toggle => 'tooltip', :placement => 'top' } } = sprite_icon('clock', css_class: 'gl-vertical-align-text-bottom') - = event.created_at.to_time.in_time_zone.strftime('%-I:%M%P') + = event.created_at.to_time.in_time_zone(@user.timezone).strftime('%-I:%M%P') - if event.visible_to_user?(current_user) - if event.push_action? #{event.action_name} #{event.ref_type} |