diff --git a/app/controllers/concerns/issues_action.rb b/app/controllers/concerns/issues_action.rb
index b17c138d5c74d4c154df6111108f902ce44cb89e..404559c8707cc5b750ebbf8cc922d874c91e6e64 100644
--- a/app/controllers/concerns/issues_action.rb
+++ b/app/controllers/concerns/issues_action.rb
@@ -14,7 +14,7 @@ module IssuesAction
 
     respond_to do |format|
       format.html
-      format.atom { render layout: false }
+      format.atom { render layout: 'xml.atom' }
     end
   end
 end
diff --git a/app/controllers/dashboard/projects_controller.rb b/app/controllers/dashboard/projects_controller.rb
index 3d49ea975918f15c14fd4ae2d5e2877d720ae9d4..641c502dbe4dcdd9e9025404da186fff46a1b83b 100644
--- a/app/controllers/dashboard/projects_controller.rb
+++ b/app/controllers/dashboard/projects_controller.rb
@@ -11,7 +11,7 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController
       format.html
       format.atom do
         load_events
-        render layout: false
+        render layout: 'xml.atom'
       end
       format.json do
         render json: {
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index c08943d993abec8a1416bb6ed1f40c726275a928..27137ffde544c75e3e781858846097144cdd94ed 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -58,7 +58,7 @@ class GroupsController < Groups::ApplicationController
 
       format.atom do
         load_events
-        render layout: false
+        render layout: 'xml.atom'
       end
     end
   end
diff --git a/app/controllers/projects/commits_controller.rb b/app/controllers/projects/commits_controller.rb
index ad92f05a42dbe8cc951e74c353f1604c3cadd6a4..f33797ca310d2e81d936fea0585a3f2c55b61791 100644
--- a/app/controllers/projects/commits_controller.rb
+++ b/app/controllers/projects/commits_controller.rb
@@ -26,7 +26,7 @@ class Projects::CommitsController < Projects::ApplicationController
 
     respond_to do |format|
       format.html
-      format.atom { render layout: false }
+      format.atom { render layout: 'xml.atom' }
 
       format.json do
         pager_json(
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb
index 8b1efd0c572893527f2beb55f2a895f82494712a..ebb163bf9dc711ae510b6c813f3dbf23558a9918 100644
--- a/app/controllers/projects/issues_controller.rb
+++ b/app/controllers/projects/issues_controller.rb
@@ -55,7 +55,7 @@ class Projects::IssuesController < Projects::ApplicationController
 
     respond_to do |format|
       format.html
-      format.atom { render layout: false }
+      format.atom { render layout: 'xml.atom' }
       format.json do
         render json: {
           html: view_to_html_string("projects/issues/_issues"),
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 38ed7d776a7c8378ec8003be724c84e04ecae8b7..5480814874b8266f4ca7f9be299c8c539333371b 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -108,7 +108,7 @@ class ProjectsController < Projects::ApplicationController
 
       format.atom do
         load_events
-        render layout: false
+        render layout: 'xml.atom'
       end
     end
   end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 19fc1e5de495cc51fcdd96fecf9dbe24adb7c3cc..c211106fbaa07d86a98d0d3d14a7fac29168e346 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -10,7 +10,7 @@ class UsersController < ApplicationController
 
       format.atom do
         load_events
-        render layout: false
+        render layout: 'xml.atom'
       end
 
       format.json do
diff --git a/app/views/dashboard/issues.atom.builder b/app/views/dashboard/issues.atom.builder
index 06fb531b546c211c5ae19d2b299bf0e14b7aa4de..70ec6bc62576fc6fc39a4e7dc208fb302aacb613 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 13f7a8ddcec67d6177ba719329ffb07dece9b881..747c53b440ed71c7dd165f977723a66ee997f715 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 469768d83f28acc55c108988a0c6ccddcb444384..a239ea8caf009fe7dd82b032697636b07852ad76 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 914091dfd157f0ff57614732fa1b829ed84914ad..0f67b15c301e2153b1af81def28a4c891c1b8166 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 0000000000000000000000000000000000000000..4ee09cb87a1674d8e543dec20f9caee9650b8274
--- /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 2f0b6e39800524b16a9a097665d409fccda2279a..9cf792e1721deaaa90f701fe4e02d79bfe294624 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 4feec09bb5d490cde12410a7fae8161dd01ac1f6..61346884346e0935ef38291a7c34345c9a6db0aa 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 5c7f2e315f040ef4f0fe614ad674a707695a91ce..ed34f5c052015295b6b4d9c94809a74f8cf8b277 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 6c85e5f9fbd531b7a7b38fcfe991714f1ffc2999..e95814875f1baac535216840d15f8961ee483000 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?