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
fa16dde0
Commit
fa16dde0
authored
Sep 14, 2021
by
Dheeraj Joshi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Switch to v-safe-html in iteration reports
parent
d8f7c412
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
8 deletions
+10
-8
ee/app/assets/javascripts/iterations/components/iteration_report.vue
...ts/javascripts/iterations/components/iteration_report.vue
+5
-4
ee/app/assets/javascripts/iterations/components/iteration_report_without_vue_router.vue
...ations/components/iteration_report_without_vue_router.vue
+5
-4
No files found.
ee/app/assets/javascripts/iterations/components/iteration_report.vue
View file @
fa16dde0
...
...
@@ -7,6 +7,7 @@ import {
GlIcon
,
GlLoadingIcon
,
GlModal
,
GlSafeHtmlDirective
,
}
from
'
@gitlab/ui
'
;
import
BurnCharts
from
'
ee/burndown_chart/components/burn_charts.vue
'
;
import
{
TYPE_ITERATION
}
from
'
~/graphql_shared/constants
'
;
...
...
@@ -33,6 +34,9 @@ export default {
IterationReportTabs
,
TimeboxStatusBadge
,
},
directives
:
{
SafeHtml
:
GlSafeHtmlDirective
,
},
apollo
:
{
iteration
:
{
query
,
...
...
@@ -176,10 +180,7 @@ export default {
</gl-modal>
</div>
<h3
ref=
"title"
class=
"page-title"
>
{{ iteration.title }}
</h3>
<div
ref=
"description"
v-html=
"iteration.descriptionHtml /* eslint-disable-line vue/no-v-html */"
></div>
<div
ref=
"description"
v-safe-html=
"iteration.descriptionHtml"
></div>
<burn-charts
:start-date=
"iteration.startDate"
:due-date=
"iteration.dueDate"
...
...
ee/app/assets/javascripts/iterations/components/iteration_report_without_vue_router.vue
View file @
fa16dde0
...
...
@@ -8,6 +8,7 @@ import {
GlIcon
,
GlLoadingIcon
,
GlModal
,
GlSafeHtmlDirective
,
}
from
'
@gitlab/ui
'
;
import
BurnCharts
from
'
ee/burndown_chart/components/burn_charts.vue
'
;
import
{
TYPE_ITERATION
}
from
'
~/graphql_shared/constants
'
;
...
...
@@ -47,6 +48,9 @@ export default {
IterationReportTabs
,
GlModal
,
},
directives
:
{
SafeHtml
:
GlSafeHtmlDirective
,
},
apollo
:
{
iteration
:
{
query
,
...
...
@@ -274,10 +278,7 @@ export default {
</gl-modal>
</div>
<h3
ref=
"title"
class=
"page-title"
>
{{ iteration.title }}
</h3>
<div
ref=
"description"
v-html=
"iteration.descriptionHtml /* eslint-disable-line vue/no-v-html */"
></div>
<div
ref=
"description"
v-safe-html=
"iteration.descriptionHtml"
></div>
<burn-charts
:start-date=
"iteration.startDate"
:due-date=
"iteration.dueDate"
...
...
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