9 files changed, 52 insertions, 72 deletions
diff --git a/app/views/dashboard/issues.atom.builder b/app/views/dashboard/issues.atom.builder
index 06fb531b546..70ec6bc6257 100644
--- a/app/views/dashboard/issues.atom.builder
+++ b/app/views/dashboard/issues.atom.builder
@@ -1,10 +1,7 @@
-xml.instruct!
-xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://search.yahoo.com/mrss/" do
-  xml.title   "#{current_user.name} issues"
-  xml.link    href: url_for(params), rel: "self", type: "application/atom+xml"
-  xml.link    href: issues_dashboard_url, rel: "alternate", type: "text/html"
-  xml.id      issues_dashboard_url
-  xml.updated @issues.first.updated_at.xmlschema if @issues.reorder(nil).any?
+xml.title   "#{current_user.name} issues"
+xml.link    href: url_for(params), rel: "self", type: "application/atom+xml"
+xml.link    href: issues_dashboard_url, rel: "alternate", type: "text/html"
+xml.id      issues_dashboard_url
+xml.updated @issues.first.updated_at.xmlschema if @issues.reorder(nil).any?
 
-  xml << render(partial: 'issues/issue', collection: @issues) if @issues.reorder(nil).any?
-end
+xml << render(partial: 'issues/issue', collection: @issues) if @issues.reorder(nil).any?
diff --git a/app/views/dashboard/projects/index.atom.builder b/app/views/dashboard/projects/index.atom.builder
index 13f7a8ddcec..747c53b440e 100644
--- a/app/views/dashboard/projects/index.atom.builder
+++ b/app/views/dashboard/projects/index.atom.builder
@@ -1,10 +1,7 @@
-xml.instruct!
-xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://search.yahoo.com/mrss/" do
-  xml.title   "Activity"
-  xml.link    href: dashboard_projects_url(rss_url_options), rel: "self", type: "application/atom+xml"
-  xml.link    href: dashboard_projects_url, rel: "alternate", type: "text/html"
-  xml.id      dashboard_projects_url
-  xml.updated @events[0].updated_at.xmlschema if @events[0]
+xml.title   "Activity"
+xml.link    href: dashboard_projects_url(rss_url_options), rel: "self", type: "application/atom+xml"
+xml.link    href: dashboard_projects_url, rel: "alternate", type: "text/html"
+xml.id      dashboard_projects_url
+xml.updated @events[0].updated_at.xmlschema if @events[0]
 
-  xml << render(partial: 'events/event', collection: @events) if @events.any?
-end
+xml << render(partial: 'events/event', collection: @events) if @events.any?
diff --git a/app/views/groups/issues.atom.builder b/app/views/groups/issues.atom.builder
index 469768d83f2..a239ea8caf0 100644
--- a/app/views/groups/issues.atom.builder
+++ b/app/views/groups/issues.atom.builder
@@ -1,10 +1,7 @@
-xml.instruct!
-xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://search.yahoo.com/mrss/" do
-  xml.title   "#{@group.name} issues"
-  xml.link    href: url_for(params), rel: "self", type: "application/atom+xml"
-  xml.link    href: issues_group_url, rel: "alternate", type: "text/html"
-  xml.id      issues_group_url
-  xml.updated @issues.first.updated_at.xmlschema if @issues.reorder(nil).any?
+xml.title   "#{@group.name} issues"
+xml.link    href: url_for(params), rel: "self", type: "application/atom+xml"
+xml.link    href: issues_group_url, rel: "alternate", type: "text/html"
+xml.id      issues_group_url
+xml.updated @issues.first.updated_at.xmlschema if @issues.reorder(nil).any?
 
-  xml << render(partial: 'issues/issue', collection: @issues) if @issues.reorder(nil).any?
-end
+xml << render(partial: 'issues/issue', collection: @issues) if @issues.reorder(nil).any?
diff --git a/app/views/groups/show.atom.builder b/app/views/groups/show.atom.builder
index 914091dfd15..0f67b15c301 100644
--- a/app/views/groups/show.atom.builder
+++ b/app/views/groups/show.atom.builder
@@ -1,10 +1,7 @@
-xml.instruct!
-xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://search.yahoo.com/mrss/" do
-  xml.title   "#{@group.name} activity"
-  xml.link    href: group_url(@group, rss_url_options), rel: "self", type: "application/atom+xml"
-  xml.link    href: group_url(@group), rel: "alternate", type: "text/html"
-  xml.id      group_url(@group)
-  xml.updated @events[0].updated_at.xmlschema if @events[0]
+xml.title   "#{@group.name} activity"
+xml.link    href: group_url(@group, rss_url_options), rel: "self", type: "application/atom+xml"
+xml.link    href: group_url(@group), rel: "alternate", type: "text/html"
+xml.id      group_url(@group)
+xml.updated @events[0].updated_at.xmlschema if @events[0]
 
-  xml << render(@events) if @events.any?
-end
+xml << render(@events) if @events.any?
diff --git a/app/views/layouts/xml.atom.builder b/app/views/layouts/xml.atom.builder
new file mode 100644
index 00000000000..4ee09cb87a1
--- /dev/null
+++ b/app/views/layouts/xml.atom.builder
@@ -0,0 +1,4 @@
+xml.instruct!
+xml.feed 'xmlns' => 'http://www.w3.org/2005/Atom', 'xmlns:media' => 'http://search.yahoo.com/mrss/' do
+  xml << yield
+end
diff --git a/app/views/projects/commits/show.atom.builder b/app/views/projects/commits/show.atom.builder
index 2f0b6e39800..9cf792e1721 100644
--- a/app/views/projects/commits/show.atom.builder
+++ b/app/views/projects/commits/show.atom.builder
@@ -1,10 +1,7 @@
-xml.instruct!
-xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://search.yahoo.com/mrss/" do
-  xml.title   "#{@project.name}:#{@ref} commits"
-  xml.link    href: namespace_project_commits_url(@project.namespace, @project, @ref, rss_url_options), rel: "self", type: "application/atom+xml"
-  xml.link    href: namespace_project_commits_url(@project.namespace, @project, @ref), rel: "alternate", type: "text/html"
-  xml.id      namespace_project_commits_url(@project.namespace, @project, @ref)
-  xml.updated @commits.first.committed_date.xmlschema if @commits.any?
+xml.title   "#{@project.name}:#{@ref} commits"
+xml.link    href: namespace_project_commits_url(@project.namespace, @project, @ref, rss_url_options), rel: "self", type: "application/atom+xml"
+xml.link    href: namespace_project_commits_url(@project.namespace, @project, @ref), rel: "alternate", type: "text/html"
+xml.id      namespace_project_commits_url(@project.namespace, @project, @ref)
+xml.updated @commits.first.committed_date.xmlschema if @commits.any?
 
-  xml << render(@commits) if @commits.any?
-end
+xml << render(@commits) if @commits.any?
diff --git a/app/views/projects/issues/index.atom.builder b/app/views/projects/issues/index.atom.builder
index 4feec09bb5d..61346884346 100644
--- a/app/views/projects/issues/index.atom.builder
+++ b/app/views/projects/issues/index.atom.builder
@@ -1,10 +1,7 @@
-xml.instruct!
-xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://search.yahoo.com/mrss/" do
-  xml.title   "#{@project.name} issues"
-  xml.link    href: url_for(params), rel: "self", type: "application/atom+xml"
-  xml.link    href: namespace_project_issues_url(@project.namespace, @project), rel: "alternate", type: "text/html"
-  xml.id      namespace_project_issues_url(@project.namespace, @project)
-  xml.updated @issues.first.updated_at.xmlschema if @issues.reorder(nil).any?
+xml.title   "#{@project.name} issues"
+xml.link    href: url_for(params), rel: "self", type: "application/atom+xml"
+xml.link    href: namespace_project_issues_url(@project.namespace, @project), rel: "alternate", type: "text/html"
+xml.id      namespace_project_issues_url(@project.namespace, @project)
+xml.updated @issues.first.updated_at.xmlschema if @issues.reorder(nil).any?
 
-  xml << render(partial: 'issues/issue', collection: @issues) if @issues.reorder(nil).any?
-end
+xml << render(partial: 'issues/issue', collection: @issues) if @issues.reorder(nil).any?
diff --git a/app/views/projects/show.atom.builder b/app/views/projects/show.atom.builder
index 5c7f2e315f0..ed34f5c0520 100644
--- a/app/views/projects/show.atom.builder
+++ b/app/views/projects/show.atom.builder
@@ -1,10 +1,7 @@
-xml.instruct!
-xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://search.yahoo.com/mrss/" do
-  xml.title   "#{@project.name} activity"
-  xml.link    href: namespace_project_url(@project.namespace, @project, rss_url_options), rel: "self", type: "application/atom+xml"
-  xml.link    href: namespace_project_url(@project.namespace, @project), rel: "alternate", type: "text/html"
-  xml.id      namespace_project_url(@project.namespace, @project)
-  xml.updated @events[0].updated_at.xmlschema if @events[0]
+xml.title   "#{@project.name} activity"
+xml.link    href: namespace_project_url(@project.namespace, @project, rss_url_options), rel: "self", type: "application/atom+xml"
+xml.link    href: namespace_project_url(@project.namespace, @project), rel: "alternate", type: "text/html"
+xml.id      namespace_project_url(@project.namespace, @project)
+xml.updated @events[0].updated_at.xmlschema if @events[0]
 
-  xml << render(@events) if @events.any?
-end
+xml << render(@events) if @events.any?
diff --git a/app/views/users/show.atom.builder b/app/views/users/show.atom.builder
index 6c85e5f9fbd..e95814875f1 100644
--- a/app/views/users/show.atom.builder
+++ b/app/views/users/show.atom.builder
@@ -1,10 +1,7 @@
-xml.instruct!
-xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://search.yahoo.com/mrss/" do
-  xml.title   "#{@user.name} activity"
-  xml.link    href: user_url(@user, :atom), rel: "self", type: "application/atom+xml"
-  xml.link    href: user_url(@user), rel: "alternate", type: "text/html"
-  xml.id      user_url(@user)
-  xml.updated @events[0].updated_at.xmlschema if @events[0]
+xml.title   "#{@user.name} activity"
+xml.link    href: user_url(@user, :atom), rel: "self", type: "application/atom+xml"
+xml.link    href: user_url(@user), rel: "alternate", type: "text/html"
+xml.id      user_url(@user)
+xml.updated @events[0].updated_at.xmlschema if @events[0]
 
-  xml << render(@events) if @events.any?
-end
+xml << render(@events) if @events.any?