Merge remote-tracking branch 'origin/master' into dz-nested-groups-improvements-3dz-nested-groups-improvements-3

1 files changed, 9 insertions, 5 deletions

diff --git a/app/views/users/calendar_activities.html.haml b/app/views/users/calendar_activities.html.haml
index dae147ca8be..4afd31f788b 100644
--- a/app/views/users/calendar_activities.html.haml
+++ b/app/views/users/calendar_activities.html.haml
@@ -10,13 +10,17 @@
           %i.fa.fa-clock-o
           = event.created_at.to_s(:time)
         - if event.push?
-          #{event.action_name} #{event.ref_type} #{event.ref_name}
+          #{event.action_name} #{event.ref_type}
+          %strong
+            - commits_path = namespace_project_commits_path(event.project.namespace, event.project, event.ref_name)
+            = link_to_if event.project.repository.branch_exists?(event.ref_name), event.ref_name, commits_path
         - else
           = event_action_name(event)
-          - 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]
+          %strong
+            - if event.note?
+              = link_to event.note_target.to_reference, event_note_target_path(event)
+            - elsif event.target
+              = link_to event.target.to_reference, [event.project.namespace.becomes(Namespace), event.project, event.target]
 
         at
         %strong