diff options
Diffstat (limited to 'app/views/users')
| -rw-r--r-- | app/views/users/calendar.html.haml | 2 | ||||
| -rw-r--r-- | app/views/users/calendar_activities.html.haml | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/app/views/users/calendar.html.haml b/app/views/users/calendar.html.haml index 6228245d8d0..57b8845c55d 100644 --- a/app/views/users/calendar.html.haml +++ b/app/views/users/calendar.html.haml @@ -1,7 +1,7 @@ .clearfix.calendar .js-contrib-calendar .calendar-hint - Summary of issues, merge requests, and push events + Summary of issues, merge requests, push events, and comments :javascript new Calendar( #{@activity_dates.to_json}, diff --git a/app/views/users/calendar_activities.html.haml b/app/views/users/calendar_activities.html.haml index b09782749f5..dae147ca8be 100644 --- a/app/views/users/calendar_activities.html.haml +++ b/app/views/users/calendar_activities.html.haml @@ -13,8 +13,10 @@ #{event.action_name} #{event.ref_type} #{event.ref_name} - else = event_action_name(event) - - if event.target - %strong= link_to "#{event.target.to_reference}", [event.project.namespace.becomes(Namespace), event.project, event.target] + - if event.note? + %strong= link_to event.note_target.to_reference, event_note_target_path(event) + - elsif event.target + %strong= link_to event.target.to_reference, [event.project.namespace.becomes(Namespace), event.project, event.target] at %strong |