diff --git a/app/views/issues/_issues_calendar.ics.ruby b/app/views/issues/_issues_calendar.ics.ruby index 73ab8489e0c1f96c7ba2c74753df33c446fda761..94c3099ace245644d59fecdae329d6cf6966075f 100644 --- a/app/views/issues/_issues_calendar.ics.ruby +++ b/app/views/issues/_issues_calendar.ics.ruby @@ -3,7 +3,7 @@ cal.prodid = '-//GitLab//NONSGML GitLab//EN' cal.x_wr_calname = 'GitLab Issues' # rubocop: disable CodeReuse/ActiveRecord -@issues.includes(project: :namespace).each do |issue| +@issues.preload(project: :namespace).each do |issue| cal.event do |event| event.dtstart = Icalendar::Values::Date.new(issue.due_date) event.summary = "#{issue.title} (in #{issue.project.full_path})" diff --git a/changelogs/unreleased/54146-fix-calendar-query.yml b/changelogs/unreleased/54146-fix-calendar-query.yml new file mode 100644 index 0000000000000000000000000000000000000000..dcac343108a0c8401f4d7e6c9518a961084ec2f6 --- /dev/null +++ b/changelogs/unreleased/54146-fix-calendar-query.yml @@ -0,0 +1,5 @@ +--- +title: Fix project calendar feed when sorted by priority +merge_request: 23870 +author: +type: fixed diff --git a/spec/features/ics/project_issues_spec.rb b/spec/features/ics/project_issues_spec.rb index 2ca3d52a5be8a3f55f15f3dd56cfb2b38c2d5140..54143595e6bf7e9a97191d82b1b8314cab8006b0 100644 --- a/spec/features/ics/project_issues_spec.rb +++ b/spec/features/ics/project_issues_spec.rb @@ -72,5 +72,14 @@ describe 'Project Issues Calendar Feed' do expect(body).to have_text('TRANSP:TRANSPARENT') end end + + context 'sorted by priority' do + it 'renders calendar feed' do + visit project_issues_path(project, :ics, sort: 'priority', feed_token: user.feed_token) + + expect(response_headers['Content-Type']).to have_content('text/calendar') + expect(body).to have_text('BEGIN:VCALENDAR') + end + end end end