Commit fcc19300 authored by Olena Horal-Koretska's avatar Olena Horal-Koretska

Merge branch 'vs/replace-v-html-with-safe-html-in-help-state' into 'master'

Replace v-html with v-safe-html in help_state.vue

See merge request gitlab-org/gitlab!66898
parents 47c21c82 31863be8
<script>
/* eslint-disable vue/no-v-html */
import { GlButton } from '@gitlab/ui';
import { GlButton, GlSafeHtmlDirective } from '@gitlab/ui';
import { joinPaths } from '~/lib/utils/url_utility';
import { sprintf, s__ } from '../../../locale';
......@@ -9,6 +8,9 @@ export default {
components: {
GlButton,
},
directives: {
SafeHtml: GlSafeHtmlDirective,
},
computed: {
href() {
return joinPaths(gon.relative_url_root || '', '/help/user/project/time_tracking.md');
......@@ -40,8 +42,8 @@ export default {
<div class="time-tracking-info">
<h4>{{ __('Track time with quick actions') }}</h4>
<p>{{ __('Quick actions can be used in description and comment boxes.') }}</p>
<p v-html="estimateText"></p>
<p v-html="spendText"></p>
<p v-safe-html="estimateText"></p>
<p v-safe-html="spendText"></p>
<gl-button :href="href">{{ __('Learn more') }}</gl-button>
</div>
</div>
......
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