diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2012-09-25 19:25:14 -0400 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2012-09-26 16:32:23 -0400 |
| commit | 545dc7e47d627a5ba4b4219880801f26fbb77f4d (patch) | |
| tree | da22f38e08ca9c174c7002e07ca545b54dbbcb82 /app | |
| parent | 3ad931ca9211d2ca0f345f97db00193ee5533dfd (diff) | |
| download | gitlab-ce-545dc7e47d627a5ba4b4219880801f26fbb77f4d.tar.gz | |
Fix atom feed links
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/commits/_head.html.haml | 2 | ||||
| -rw-r--r-- | app/views/commits/show.atom.builder | 4 | ||||
| -rw-r--r-- | app/views/compare/_head.html.haml | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/app/views/commits/_head.html.haml b/app/views/commits/_head.html.haml index a8111a72ed5..cdee391f493 100644 --- a/app/views/commits/_head.html.haml +++ b/app/views/commits/_head.html.haml @@ -19,5 +19,5 @@ - if current_page?(project_commits_path(@project)) && current_user.private_token %li.right %span.rss-icon - = link_to project_commits_path(@project, :atom, { private_token: current_user.private_token, ref: @ref }), title: "Feed" do + = link_to project_commits_path(@project, @ref, {format: :atom, private_token: current_user.private_token}), title: "Feed" do = image_tag "rss_ui.png", title: "feed" diff --git a/app/views/commits/show.atom.builder b/app/views/commits/show.atom.builder index cca704560e4..46f9838e84a 100644 --- a/app/views/commits/show.atom.builder +++ b/app/views/commits/show.atom.builder @@ -1,8 +1,8 @@ xml.instruct! xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://search.yahoo.com/mrss/" do xml.title "Recent commits to #{@project.name}:#{@ref}" - xml.link :href => project_commits_url(@project, :atom, :ref => @ref), :rel => "self", :type => "application/atom+xml" - xml.link :href => project_commits_url(@project), :rel => "alternate", :type => "text/html" + xml.link :href => project_commits_url(@project, @ref, format: :atom), :rel => "self", :type => "application/atom+xml" + xml.link :href => project_commits_url(@project, @ref), :rel => "alternate", :type => "text/html" xml.id project_commits_url(@project) xml.updated @commits.first.committed_date.strftime("%Y-%m-%dT%H:%M:%SZ") if @commits.any? diff --git a/app/views/compare/_head.html.haml b/app/views/compare/_head.html.haml index a8111a72ed5..cdee391f493 100644 --- a/app/views/compare/_head.html.haml +++ b/app/views/compare/_head.html.haml @@ -19,5 +19,5 @@ - if current_page?(project_commits_path(@project)) && current_user.private_token %li.right %span.rss-icon - = link_to project_commits_path(@project, :atom, { private_token: current_user.private_token, ref: @ref }), title: "Feed" do + = link_to project_commits_path(@project, @ref, {format: :atom, private_token: current_user.private_token}), title: "Feed" do = image_tag "rss_ui.png", title: "feed" |