diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-04-21 18:03:23 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-04-23 18:11:39 +0300 |
| commit | 9c60354a6a7e2f0249719b4c0cf929c5d8ebc6e2 (patch) | |
| tree | a04cf70072271fc4eec67359ba8ad6e1c7f6e302 /app/views/groups | |
| parent | a6dfd065ca9de2e421425a5126c68bf8949ce110 (diff) | |
Make links and titles of atom feeds consistent.
Diffstat (limited to 'app/views/groups')
| -rw-r--r-- | app/views/groups/issues.atom.builder | 6 | ||||
| -rw-r--r-- | app/views/groups/show.atom.builder | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/app/views/groups/issues.atom.builder b/app/views/groups/issues.atom.builder index 240001967f3..74f9389b914 100644 --- a/app/views/groups/issues.atom.builder +++ b/app/views/groups/issues.atom.builder @@ -1,9 +1,9 @@ xml.instruct! xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://search.yahoo.com/mrss/" do xml.title "#{@user.name} issues" - xml.link :href => issues_dashboard_url(:atom, :private_token => @user.private_token), :rel => "self", :type => "application/atom+xml" - xml.link :href => issues_dashboard_url(:private_token => @user.private_token), :rel => "alternate", :type => "text/html" - xml.id issues_dashboard_url(:private_token => @user.private_token) + xml.link href: issues_dashboard_url(format: :atom, private_token: @user.private_token), rel: "self", type: "application/atom+xml" + xml.link href: issues_dashboard_url(private_token: @user.private_token), rel: "alternate", type: "text/html" + xml.id issues_dashboard_url xml.updated @issues.first.created_at.strftime("%Y-%m-%dT%H:%M:%SZ") if @issues.any? @issues.each do |issue| diff --git a/app/views/groups/show.atom.builder b/app/views/groups/show.atom.builder index c78bd1bd263..4c67d2d14a8 100644 --- a/app/views/groups/show.atom.builder +++ b/app/views/groups/show.atom.builder @@ -1,9 +1,9 @@ xml.instruct! xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://search.yahoo.com/mrss/" do - xml.title "Group feed - #{@group.name}" - xml.link href: group_path(@group, :atom), rel: "self", type: "application/atom+xml" - xml.link href: group_path(@group), rel: "alternate", type: "text/html" - xml.id projects_url + xml.title "#{@group.name} activity" + xml.link href: group_url(@group, format: :atom, private_token: current_user.private_token), rel: "self", type: "application/atom+xml" + xml.link href: group_url(@group, private_token: current_user.private_token), rel: "alternate", type: "text/html" + xml.id group_url(@group) xml.updated @events.maximum(:updated_at).strftime("%Y-%m-%dT%H:%M:%SZ") if @events.any? @events.each do |event| |