Read about our upcoming Code of Conduct on this issue

Commit e577bf2d authored by Rémy Coutable's avatar Rémy Coutable
Browse files

Merge branch '15640-confidential-issue' into 'master'

Fix atom feeds and links

1. The atom feed for a group's issues didn't work, because it had parts copied from the dashboard issues builder template.
2. The feed link from a group's activity page went to the dashboard feed, rather than the group's feed.

Closes #15640

See merge request !4191
......@@ -39,6 +39,7 @@ v 8.8.0 (unreleased)
- Create tags using Rugged for performance reasons. !3745
- API: Expose Issue#user_notes_count. !3126 (Anton Popov)
- Don't show forks button when user can't view forks
- Fix atom feed links and rendering
- Files over 5MB can only be viewed in their raw form, files over 1MB without highlighting !3718
- Add support for supressing text diffs using .gitattributes on the default branch (Matt Oakes)
- Add eager load paths to help prevent dependency load issues in Sidekiq workers. !3724
......@@ -4,7 +4,7 @@
- if current_user
= link_to dashboard_projects_path(:atom, { private_token: current_user.private_token }), class: 'btn rss-btn' do
= link_to group_path(@group, format: :atom, private_token: current_user.private_token), class: 'btn rss-btn' do
= render 'shared/event_filter'
xml.feed "xmlns" => "", "xmlns:media" => "" do
xml.title "#{} issues" href: issues_dashboard_url(format: :atom, private_token: @user.private_token), rel: "self", type: "application/atom+xml" href: issues_dashboard_url, rel: "alternate", type: "text/html" issues_dashboard_url
xml.title "#{} issues" href: issues_group_url(format: :atom, private_token: current_user.try(:private_token)), rel: "self", type: "application/atom+xml" href: issues_group_url, rel: "alternate", type: "text/html" issues_group_url
xml.updated @issues.first.created_at.xmlschema if @issues.any?
@issues.each do |issue|
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment