File fix_activity.patch of Package portus.4171

diff --git a/app/views/public_activity/webhook/_create.html.slim b/app/views/public_activity/webhook/_create.html.slim
index 2cc5b520168b..df752259e0ca 100644
--- a/app/views/public_activity/webhook/_create.html.slim
+++ b/app/views/public_activity/webhook/_create.html.slim
@@ -7,7 +7,7 @@ li
     .description
       h6
         strong
-          = "#{activity.owner.username} created webhook "
+          = "#{activity_owner(activity)} created webhook "
         - if activity.trackable
           = link_to activity.trackable.host, [activity.trackable.namespace, activity.trackable]
         - else
diff --git a/app/views/public_activity/webhook/_enabled.csv.slim b/app/views/public_activity/webhook/_enabled.csv.slim
index b90ab32a4442..1e5d28b7bacf 100644
--- a/app/views/public_activity/webhook/_enabled.csv.slim
+++ b/app/views/public_activity/webhook/_enabled.csv.slim
@@ -1 +1,4 @@
-= CSV.generate_line(['webhook', activity.trackable.url, 'make enabled', '-', activity.owner.username, activity.created_at, '-'])
+- if activity.trackable
+  = CSV.generate_line(['webhook', activity.trackable.url, 'make enabled', '-', activity_owner(activity), activity.created_at, '-'])
+- else
+  = CSV.generate_line(['webhook', activity.parameters[:webhook_host] , 'make enabled', '-', activity_owner(activity), activity.created_at, '-'])
diff --git a/app/views/public_activity/webhook/_enabled.html.slim b/app/views/public_activity/webhook/_enabled.html.slim
index a3462d1e387e..28613e935d63 100644
--- a/app/views/public_activity/webhook/_enabled.html.slim
+++ b/app/views/public_activity/webhook/_enabled.html.slim
@@ -7,7 +7,7 @@ li
     .description
       h6
         strong
-          = "#{activity.owner.username} set the "
+          = "#{activity_owner(activity)} set the "
         - if activity.trackable.nil?
           = activity.parameters[:webhook_host]
         - else