diff options
author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-12-19 10:03:44 +0000 |
---|---|---|
committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-12-19 10:03:44 +0000 |
commit | ffef28ccd6d37ade2c3ee3ca46679749f9cf09aa (patch) | |
tree | a2e80a4edeeb8420ccc7387a575c2bae25e5cce4 | |
parent | 1f7c072e08913dda0534bc5534a50f389567433f (diff) | |
parent | 685c0f237d5b2a736e996e9f07bccffbaa205938 (diff) | |
download | gitlab-ce-ffef28ccd6d37ade2c3ee3ca46679749f9cf09aa.tar.gz |
Merge branch '54146-fix-calendar-query' into 'master'
Fix calendar feed when sorted by priority
Closes #54146
See merge request gitlab-org/gitlab-ce!23870
-rw-r--r-- | app/views/issues/_issues_calendar.ics.ruby | 2 | ||||
-rw-r--r-- | changelogs/unreleased/54146-fix-calendar-query.yml | 5 | ||||
-rw-r--r-- | spec/features/ics/project_issues_spec.rb | 9 |
3 files changed, 15 insertions, 1 deletions
diff --git a/app/views/issues/_issues_calendar.ics.ruby b/app/views/issues/_issues_calendar.ics.ruby index 73ab8489e0c..94c3099ace2 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 00000000000..dcac343108a --- /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 2ca3d52a5be..54143595e6b 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 |