Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
8183c919
Commit
8183c919
authored
6 years ago
by
Kushal Pandya
Committed by
Rémy Coutable
6 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Show user contributions in correct timezone within user profile
parent
f912e3b1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
app/views/users/calendar_activities.html.haml
app/views/users/calendar_activities.html.haml
+1
-1
changelogs/unreleased/38495-calendar-activities-in-timezone.yml
...logs/unreleased/38495-calendar-activities-in-timezone.yml
+5
-0
No files found.
app/views/users/calendar_activities.html.haml
View file @
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
}
...
...
This diff is collapsed.
Click to expand it.
changelogs/unreleased/38495-calendar-activities-in-timezone.yml
0 → 100644
View file @
8183c919
---
title
:
Show user contributions in correct timezone within user profile
merge_request
:
23419
author
:
type
:
changed
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment