Merge branch 'rs-remove-issue_to_atom' into 'master'

Remove `issue_to_atom` helper



See merge request !4265

app/helpers/issues_helper.rb

@@ -105,23 +105,6 @@ module IssuesHelper
     return 'hidden' if issue.closed? == closed
   end
 
-  def issue_to_atom(xml, issue)
-    xml.entry do
-      xml.id      namespace_project_issue_url(issue.project.namespace,
-                                              issue.project, issue)
-      xml.link    href: namespace_project_issue_url(issue.project.namespace,
-                                                    issue.project, issue)
-      xml.title   truncate(issue.title, length: 80)
-      xml.updated issue.created_at.xmlschema
-      xml.media   :thumbnail, width: "40", height: "40", url: image_url(avatar_icon(issue.author_email))
-      xml.author do |author|
-        xml.name issue.author_name
-        xml.email issue.author_email
-      end
-      xml.summary issue.title
-    end
-  end
-
   def merge_requests_sentence(merge_requests)
     # Sorting based on the `!123` or `group/project!123` reference will sort
     # local merge requests first.

app/views/dashboard/issues.atom.builder

@@ -6,8 +6,5 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://sear
   xml.id      issues_dashboard_url
   xml.updated @issues.first.created_at.xmlschema if @issues.any?
 
-  @issues.each do |issue|
-    issue_to_atom(xml, issue)
-  end
+  xml << render(partial: 'issues/issue', collection: @issues) if @issues.any?
 end
-

app/views/groups/issues.atom.builder

@@ -6,8 +6,5 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://sear
   xml.id      issues_group_url
   xml.updated @issues.first.created_at.xmlschema if @issues.any?
 
-  @issues.each do |issue|
-    issue_to_atom(xml, issue)
-  end
+  xml << render(partial: 'issues/issue', collection: @issues) if @issues.any?
 end
-

app/views/issues/_issue.atom.builder

+xml.entry do
+  xml.id      namespace_project_issue_url(issue.project.namespace, issue.project, issue)
+  xml.link    href: namespace_project_issue_url(issue.project.namespace, issue.project, issue)
+  xml.title   truncate(issue.title, length: 80)
+  xml.updated issue.created_at.xmlschema
+  xml.media   :thumbnail, width: "40", height: "40", url: image_url(avatar_icon(issue.author_email))
+
+  xml.author do |author|
+    xml.name issue.author_name
+    xml.email issue.author_email
+  end
+
+  xml.summary issue.title
+end

app/views/projects/issues/index.atom.builder

@@ -6,7 +6,5 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://sear
   xml.id      namespace_project_issues_url(@project.namespace, @project)
   xml.updated @issues.first.created_at.xmlschema if @issues.any?
 
-  @issues.each do |issue|
-    issue_to_atom(xml, issue)
-  end
+  xml << render(partial: 'issues/issue', collection: @issues) if @issues.any?
 end