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
e4408ec1
Commit
e4408ec1
authored
Sep 08, 2021
by
Dheeraj Joshi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Switch to v-safe-html for MR empty state svg
parent
aa0a1d0c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
2 deletions
+6
-2
app/assets/javascripts/vue_merge_request_widget/components/states/nothing_to_merge.vue
...rge_request_widget/components/states/nothing_to_merge.vue
+6
-2
No files found.
app/assets/javascripts/vue_merge_request_widget/components/states/nothing_to_merge.vue
View file @
e4408ec1
<
script
>
import
{
GlButton
,
GlSprintf
,
GlLink
}
from
'
@gitlab/ui
'
;
import
{
GlButton
,
GlSprintf
,
GlLink
,
GlSafeHtmlDirective
}
from
'
@gitlab/ui
'
;
import
emptyStateSVG
from
'
icons/_mr_widget_empty_state.svg
'
;
import
{
helpPagePath
}
from
'
~/helpers/help_page_helper
'
;
...
...
@@ -10,6 +10,9 @@ export default {
GlSprintf
,
GlLink
,
},
directives
:
{
SafeHtml
:
GlSafeHtmlDirective
,
},
props
:
{
mr
:
{
type
:
Object
,
...
...
@@ -20,6 +23,7 @@ export default {
return
{
emptyStateSVG
};
},
ciHelpPage
:
helpPagePath
(
'
/ci/quick_start/index.html
'
),
safeHtmlConfig
:
{
ADD_TAGS
:
[
'
use
'
]
},
};
</
script
>
...
...
@@ -29,7 +33,7 @@ export default {
<div
class=
"artwork col-md-5 order-md-last col-12 text-center d-flex justify-content-center align-items-center"
>
<span
v-
html=
"emptyStateSVG /* eslint-disable-line vue/no-v-html */
"
></span>
<span
v-
safe-html:
[$
options.safeHtmlConfig]=
"emptyStateSVG
"
></span>
</div>
<div
class=
"text col-md-7 order-md-first col-12"
>
<p
class=
"highlight"
>
...
...
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