Commit 98a4386b authored by Kushal Pandya's avatar Kushal Pandya

Merge branch 'djadmin-v-html-svg-icon2' into 'master'

Switch to v-safe-html for MR empty state svg

See merge request gitlab-org/gitlab!69836
parents 3ff1a00e e4408ec1
<script> <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 emptyStateSVG from 'icons/_mr_widget_empty_state.svg';
import { helpPagePath } from '~/helpers/help_page_helper'; import { helpPagePath } from '~/helpers/help_page_helper';
...@@ -10,6 +10,9 @@ export default { ...@@ -10,6 +10,9 @@ export default {
GlSprintf, GlSprintf,
GlLink, GlLink,
}, },
directives: {
SafeHtml: GlSafeHtmlDirective,
},
props: { props: {
mr: { mr: {
type: Object, type: Object,
...@@ -20,6 +23,7 @@ export default { ...@@ -20,6 +23,7 @@ export default {
return { emptyStateSVG }; return { emptyStateSVG };
}, },
ciHelpPage: helpPagePath('/ci/quick_start/index.html'), ciHelpPage: helpPagePath('/ci/quick_start/index.html'),
safeHtmlConfig: { ADD_TAGS: ['use'] },
}; };
</script> </script>
...@@ -29,7 +33,7 @@ export default { ...@@ -29,7 +33,7 @@ export default {
<div <div
class="artwork col-md-5 order-md-last col-12 text-center d-flex justify-content-center align-items-center" 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>
<div class="text col-md-7 order-md-first col-12"> <div class="text col-md-7 order-md-first col-12">
<p class="highlight"> <p class="highlight">
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment