Remove `event_to_atom` helper

5 files changed, 24 insertions, 12 deletions

diff --git a/app/views/dashboard/projects/index.atom.builder b/app/views/dashboard/projects/index.atom.builder
index d4daf07c6c0..fb5be63b472 100644
--- a/app/views/dashboard/projects/index.atom.builder
+++ b/app/views/dashboard/projects/index.atom.builder
@@ -6,7 +6,5 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://sear
   xml.id      dashboard_projects_url
   xml.updated @events[0].updated_at.xmlschema if @events[0]
 
-  @events.each do |event|
-    event_to_atom(xml, event)
-  end
+  xml << render(partial: 'events/event', collection: @events) if @events.any?
 end
diff --git a/app/views/events/_event.atom.builder b/app/views/events/_event.atom.builder
new file mode 100644
index 00000000000..7890e717aa7
--- /dev/null
+++ b/app/views/events/_event.atom.builder
@@ -0,0 +1,20 @@
+return unless event.visible_to_user?(current_user)
+
+xml.entry do
+  xml.id      "tag:#{request.host},#{event.created_at.strftime("%Y-%m-%d")}:#{event.id}"
+  xml.link    href: event_feed_url(event)
+  xml.title   truncate(event_feed_title(event), length: 80)
+  xml.updated event.created_at.xmlschema
+  xml.media   :thumbnail, width: "40", height: "40", url: image_url(avatar_icon(event.author_email))
+
+  xml.author do
+    xml.name event.author_name
+    xml.email event.author_email
+  end
+
+  xml.summary(type: "xhtml") do |summary|
+    event_summary = event_feed_summary(event)
+
+    summary << event_summary unless event_summary.nil?
+  end
+end
diff --git a/app/views/groups/show.atom.builder b/app/views/groups/show.atom.builder
index c66b82bb484..b68bf444d27 100644
--- a/app/views/groups/show.atom.builder
+++ b/app/views/groups/show.atom.builder
@@ -6,7 +6,5 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://sear
   xml.id      group_url(@group)
   xml.updated @events[0].updated_at.xmlschema if @events[0]
 
-  @events.each do |event|
-    event_to_atom(xml, event)
-  end
+  xml << render(@events) if @events.any?
 end
diff --git a/app/views/projects/show.atom.builder b/app/views/projects/show.atom.builder
index 9b3d3f069d9..11310d5e1e1 100644
--- a/app/views/projects/show.atom.builder
+++ b/app/views/projects/show.atom.builder
@@ -6,7 +6,5 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://sear
   xml.id      namespace_project_url(@project.namespace, @project)
   xml.updated @events[0].updated_at.xmlschema if @events[0]
 
-  @events.each do |event|
-    event_to_atom(xml, event)
-  end
+  xml << render(@events) if @events.any?
 end
diff --git a/app/views/users/show.atom.builder b/app/views/users/show.atom.builder
index e9e466c6350..6c85e5f9fbd 100644
--- a/app/views/users/show.atom.builder
+++ b/app/views/users/show.atom.builder
@@ -6,7 +6,5 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://sear
   xml.id      user_url(@user)
   xml.updated @events[0].updated_at.xmlschema if @events[0]
 
-  @events.each do |event|
-    event_to_atom(xml, event)
-  end
+  xml << render(@events) if @events.any?
 end