diff --git a/app/views/dashboard/issues.html.haml b/app/views/dashboard/issues.html.haml
index db19a46cb263dd075e79dbcd6dc1e62e4396d5a7..79e518f5f389b701ce44210b8020a868762563fb 100644
--- a/app/views/dashboard/issues.html.haml
+++ b/app/views/dashboard/issues.html.haml
@@ -1,3 +1,7 @@
+= content_for :meta_tags do
+  - if current_user
+    = auto_discovery_link_tag(:atom, issues_dashboard_url(format: :atom, private_token: current_user.private_token), title: "#{current_user.name} issues")
+
 %h3.page-title
   Issues
 
diff --git a/app/views/dashboard/show.html.haml b/app/views/dashboard/show.html.haml
index fa8946011b741331df864f866420150af171f20c..2754a4894da89dbb99617ea61a7be2eaa0e775c9 100644
--- a/app/views/dashboard/show.html.haml
+++ b/app/views/dashboard/show.html.haml
@@ -1,3 +1,7 @@
+= content_for :meta_tags do
+  - if current_user
+    = auto_discovery_link_tag(:atom, dashboard_url(format: :atom, private_token: current_user.private_token), title: "All activity")
+
 - if @projects.any?
   .dashboard.row
     %section.activities.col-md-8
diff --git a/app/views/groups/issues.html.haml b/app/views/groups/issues.html.haml
index 6c0d89c4e7cbf7e67aecb1fd8333a7526c50de86..bfdb862a2e9091b31c37d32b35d41211e03874b6 100644
--- a/app/views/groups/issues.html.haml
+++ b/app/views/groups/issues.html.haml
@@ -1,3 +1,7 @@
+= content_for :meta_tags do
+  - if current_user
+    = auto_discovery_link_tag(:atom, issues_group_url(@group, format: :atom, private_token: current_user.private_token), title: "#{@group.name} issues")
+
 %h3.page-title
   Issues
 
diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml
index 8df9366ecbe9d9a9e2cc91dd63f08dac2e0a1a5f..75a7f071c1361c265bc4c86b53863cd48eb2aba3 100644
--- a/app/views/groups/show.html.haml
+++ b/app/views/groups/show.html.haml
@@ -1,3 +1,7 @@
+= content_for :meta_tags do
+  - if current_user
+    = auto_discovery_link_tag(:atom, group_url(@group, format: :atom, private_token: current_user.private_token), title: "#{@group.name} activity")
+
 .dashboard
   .header-with-avatar.clearfix
     = image_tag group_icon(@group), class: "avatar group-avatar s90"
diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml
index 5a6ae09a506ca963be9bf48062f25079b47825c1..0ff1665455e50044886b170862e377daad96d78f 100644
--- a/app/views/layouts/_head.html.haml
+++ b/app/views/layouts/_head.html.haml
@@ -5,6 +5,7 @@
   %title
     = "#{title} | " if defined?(title)
     GitLab
+
   = favicon_link_tag 'favicon.ico'
   = stylesheet_link_tag    "application", :media => "all"
   = stylesheet_link_tag    "print", :media => "print"
@@ -14,16 +15,8 @@
   %meta{name: 'viewport', content: 'width=device-width, initial-scale=1, maximum-scale=1'}
   %meta{name: 'theme-color', content: '#474D57'}
 
+  = yield(:meta_tags)
+
   = render 'layouts/google_analytics' if extra_config.has_key?('google_analytics_id')
   = render 'layouts/piwik' if extra_config.has_key?('piwik_url') && extra_config.has_key?('piwik_site_id')
   = render 'layouts/bootlint' if Rails.env.development?
-
-  -# Atom feed
-  - if current_user
-    - if controller_name == 'projects' && action_name == 'index'
-      = auto_discovery_link_tag :atom, projects_url(:atom, private_token: current_user.private_token), title: "Dashboard feed"
-    - if @project && !@project.new_record?
-      - if current_controller?(:tree, :commits)
-        = auto_discovery_link_tag(:atom, namespace_project_commits_url(@project.namespace, @project, @ref, format: :atom, private_token: current_user.private_token), title: "Recent commits to #{@project.name}:#{@ref}")
-      - if current_controller?(:issues)
-        = auto_discovery_link_tag(:atom, namespace_project_issues_url(@project.namespace, @project, :atom, private_token: current_user.private_token), title: "#{@project.name} issues")
diff --git a/app/views/projects/commits/show.html.haml b/app/views/projects/commits/show.html.haml
index 7ea855e1a4e7b863c1c14f6ba2735cf8d17f1fa0..f7b5a6d1918488d8572c9a754a39a06ac747ade6 100644
--- a/app/views/projects/commits/show.html.haml
+++ b/app/views/projects/commits/show.html.haml
@@ -1,3 +1,7 @@
+= content_for :meta_tags do
+  - if current_user
+    = auto_discovery_link_tag(:atom, namespace_project_commits_url(@project.namespace, @project, @ref, format: :atom, private_token: current_user.private_token), title: "Recent commits to #{@project.name}:#{@ref}")
+
 = render "head"
 
 .tree-ref-holder
diff --git a/app/views/projects/issues/index.html.haml b/app/views/projects/issues/index.html.haml
index d3c7ae24a752f4b3298e9951c94de9bf67511b9f..c2522816f3b1f808dbb02338a2767b6507b9bca9 100644
--- a/app/views/projects/issues/index.html.haml
+++ b/app/views/projects/issues/index.html.haml
@@ -1,3 +1,7 @@
+= content_for :meta_tags do
+  - if current_user
+    = auto_discovery_link_tag(:atom, namespace_project_issues_url(@project.namespace, @project, :atom, private_token: current_user.private_token), title: "#{@project.name} issues")
+
 .append-bottom-10
   .pull-right
     .pull-left
diff --git a/app/views/projects/tree/show.html.haml b/app/views/projects/tree/show.html.haml
index feca145369752b8ad9e3758288dd7a33986d1e83..8f789efa122c2d150e79a27571998947ae3c09f4 100644
--- a/app/views/projects/tree/show.html.haml
+++ b/app/views/projects/tree/show.html.haml
@@ -1,3 +1,7 @@
+= content_for :meta_tags do
+  - if current_user
+    = auto_discovery_link_tag(:atom, namespace_project_commits_url(@project.namespace, @project, @ref, format: :atom, private_token: current_user.private_token), title: "Recent commits to #{@project.name}:#{@ref}")
+  
 .tree-ref-holder
   = render 'shared/ref_switcher', destination: 'tree', path: @path
 
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index 9dd8cb0738c55bb681aca50603a100e6369d82e2..a22867736299aa9e75a91bb01b60cf89328105f8 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -1,3 +1,6 @@
+= content_for :meta_tags do
+  = auto_discovery_link_tag(:atom, user_url(@user, format: :atom), title: "Activity feed for #{@user.name}")
+
 .row
   = link_to '#aside', class: 'show-aside' do
     %i.fa.fa-angle-left