Merge branch '346113-fix-incorrect-timezone-on-calendar-activities-page' into 'master'

Fix error in user calendar activities where timezone is incorrectly set

See merge request gitlab-org/gitlab!74884

app/views/users/calendar_activities.html.haml

@@ -7,7 +7,7 @@
       %li
         %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(@user.timezone).strftime('%-I:%M%P')
+          = event.created_at.to_time.in_time_zone(local_time_instance(@user.timezone)).strftime('%-I:%M%P')
         - if event.visible_to_user?(current_user)
           - if event.push_action?
             #{event.action_name} #{event.ref_type}