summaryrefslogtreecommitdiff
path: root/app/views/users
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2017-07-27 17:49:49 -0500
committerMike Greiling <mike@pixelcog.com>2017-07-28 23:53:22 -0500
commit037b37297572eadab8b50917892eb285efc4383b (patch)
treef492ef23f7c0a52970769158c7e8b91c25332afd /app/views/users
parent4c89929fb4211aa1cf5f311a0cec89988de45184 (diff)
downloadgitlab-ce-037b37297572eadab8b50917892eb285efc4383b.tar.gz
ensure user profile calendar is generated based on server timezone, not local timezone
Diffstat (limited to 'app/views/users')
-rw-r--r--app/views/users/show.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index a449706c567..879e0f99b14 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -104,7 +104,7 @@
.tab-content
#activity.tab-pane
.row-content-block.calender-block.white.second-block.hidden-xs
- .user-calendar{ data: { calendar_path: user_calendar_path(@user, :json), calendar_activities_path: user_calendar_activities_path } }
+ .user-calendar{ data: { calendar_path: user_calendar_path(@user, :json), calendar_activities_path: user_calendar_activities_path, utc_offset: Time.zone.utc_offset } }
%h4.center.light
%i.fa.fa-spinner.fa-spin
.user-calendar-activities