Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
685c0f23
Commit
685c0f23
authored
6 years ago
by
Heinrich Lee Yu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix calendar feed when sorted by priority
parent
8b460204
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
1 deletion
+15
-1
app/views/issues/_issues_calendar.ics.ruby
app/views/issues/_issues_calendar.ics.ruby
+1
-1
changelogs/unreleased/54146-fix-calendar-query.yml
changelogs/unreleased/54146-fix-calendar-query.yml
+5
-0
spec/features/ics/project_issues_spec.rb
spec/features/ics/project_issues_spec.rb
+9
-0
No files found.
app/views/issues/_issues_calendar.ics.ruby
View file @
685c0f23
...
...
@@ -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
}
)"
...
...
This diff is collapsed.
Click to expand it.
changelogs/unreleased/54146-fix-calendar-query.yml
0 → 100644
View file @
685c0f23
---
title
:
Fix project calendar feed when sorted by priority
merge_request
:
23870
author
:
type
:
fixed
This diff is collapsed.
Click to expand it.
spec/features/ics/project_issues_spec.rb
View file @
685c0f23
...
...
@@ -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
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment