diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-11-28 17:43:34 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-11-28 17:43:34 +0000 |
| commit | 75eb04161f218b40434c2175223c661a4127297e (patch) | |
| tree | 712e88daad87d951ca699f8f22e7e16ff22e7e28 | |
| parent | f912e3b1b2516be895ff51ca436d16e7747ccc3e (diff) | |
| parent | 8183c919a86196bff8289ad010205492d0a8e9ce (diff) | |
| download | gitlab-ce-75eb04161f218b40434c2175223c661a4127297e.tar.gz | |
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
| -rw-r--r-- | app/views/users/calendar_activities.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/38495-calendar-activities-in-timezone.yml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/views/users/calendar_activities.html.haml b/app/views/users/calendar_activities.html.haml index 938cb579e9f..01acbf8eadd 100644 --- a/app/views/users/calendar_activities.html.haml +++ b/app/views/users/calendar_activities.html.haml @@ -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} diff --git a/changelogs/unreleased/38495-calendar-activities-in-timezone.yml b/changelogs/unreleased/38495-calendar-activities-in-timezone.yml new file mode 100644 index 00000000000..778d637609c --- /dev/null +++ b/changelogs/unreleased/38495-calendar-activities-in-timezone.yml @@ -0,0 +1,5 @@ +--- +title: Show user contributions in correct timezone within user profile +merge_request: 23419 +author: +type: changed |