diff options
| author | Mike Greiling <mike@pixelcog.com> | 2017-07-31 23:14:32 -0500 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-07-31 23:14:32 -0500 |
| commit | 00e38789fef816eb787bf68a3db427f0f325c0e0 (patch) | |
| tree | b7b190891ce7d39f013ce9049a092903883d9a35 | |
| parent | 08c513b6d95c34d96bcc779f4c10318fafda2cb7 (diff) | |
| download | gitlab-ce-00e38789fef816eb787bf68a3db427f0f325c0e0.tar.gz | |
adjust user contribution calendar time formatting
| -rw-r--r-- | app/views/users/calendar_activities.html.haml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/views/users/calendar_activities.html.haml b/app/views/users/calendar_activities.html.haml index 805a346a85e..6b1d75c6e72 100644 --- a/app/views/users/calendar_activities.html.haml +++ b/app/views/users/calendar_activities.html.haml @@ -1,6 +1,6 @@ %h4.prepend-top-20 Contributions for - %strong= @calendar_date.to_s(:short) + %strong= @calendar_date.to_s(:medium) - if @events.any? %ul.bordered-list @@ -8,7 +8,7 @@ %li %span.light %i.fa.fa-clock-o - = event.created_at.to_s(:time) + = event.created_at.strftime('%-I:%M%P') - if event.push? #{event.action_name} #{event.ref_type} %strong @@ -30,4 +30,4 @@ = event.project_name - else %p - No contributions found for #{@calendar_date.to_s(:short)} + No contributions found for #{@calendar_date.to_s(:medium)} |