diff options
| author | Lucas Deschamps <lucasdchamps@gmail.com> | 2016-11-03 11:29:37 +0100 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-11-03 18:26:06 +0100 |
| commit | d84eb9abd6e851cfe86d4dc64e0ceff9aa9acbc0 (patch) | |
| tree | b89352b1d086d907403955ac55d78895cf0dbbbf /app/views/groups | |
| parent | 651bdd7c34c9ebf686b8357d8fc3ca4d0a58792e (diff) | |
| download | gitlab-ce-d84eb9abd6e851cfe86d4dc64e0ceff9aa9acbc0.tar.gz | |
Issues atom feed url reflect filters on dashboard22947-fix_issues_atom_feed_url
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'app/views/groups')
| -rw-r--r-- | app/views/groups/issues.atom.builder | 2 | ||||
| -rw-r--r-- | app/views/groups/issues.html.haml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/groups/issues.atom.builder b/app/views/groups/issues.atom.builder index b1628040325..0cc6466d34e 100644 --- a/app/views/groups/issues.atom.builder +++ b/app/views/groups/issues.atom.builder @@ -1,7 +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: issues_group_url(format: :atom, private_token: current_user.try(:private_token)), rel: "self", type: "application/atom+xml" + 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.created_at.xmlschema if @issues.reorder(nil).any? diff --git a/app/views/groups/issues.html.haml b/app/views/groups/issues.html.haml index 4434f1cbd35..dc6c1bb69de 100644 --- a/app/views/groups/issues.html.haml +++ b/app/views/groups/issues.html.haml @@ -1,13 +1,13 @@ - page_title "Issues" = 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") + = auto_discovery_link_tag(:atom, url_for(params.merge(format: :atom, private_token: current_user.private_token)), title: "#{@group.name} issues") .top-area = render 'shared/issuable/nav', type: :issues .nav-controls - if current_user - = link_to issues_group_url(@group, format: :atom, private_token: current_user.private_token), class: 'btn' do + = link_to url_for(params.merge(format: :atom, private_token: current_user.private_token)), class: 'btn' do = icon('rss') %span.icon-label Subscribe |