Merge remote-tracking branch 'upstream/master' into 33149-rename-more-builds33149-rename-more-builds

* upstream/master: (460 commits)
  Center dropdown for pipeline's  mini graph
  Documentation bugfix of invalid JSON payload example of Create a commit with multiple files and actions
  Fix filename method of GitlabUploader to return always real filename
  Ignore CVE-2017-5029 in Nokogiri
  Refactor atom builder by using xml.atom layout
  Let PhantomJS load local images
  Add a changelog entry
  Only add a description change note when no tasks are updated
  Doc: Add the need to upgrade to Go 1.8.3 in the 9.1->9.2 documentation as the upgrade fails with Go 1.5 (installed with Gitlab 8.1)
  Use gitaly 0.11.2
  Add the ability to perform background migrations
  Always render warnings icon in orange
  Fix a few translation for zh_TW
  Improve Job detail view to make it refreshed in real-time instead of reloading
  Attempts to run RSpec tests twice (1 retry)
  ignore name validation on importing
  Only show hover state on links and buttons
  Use vue files for navigation tabs and buttons
  doc: add example of scheduler when
  Add test for u2f helper and changelog entry
  ...

1 files changed, 6 insertions, 9 deletions

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?