Commit c3918114 authored by Andrew Fontaine's avatar Andrew Fontaine

Merge branch 'vs/replace-v-html-with-safe-html-in-self-monitor-form' into 'master'

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

See merge request gitlab-org/gitlab!66958
parents d83e71ae 7b98598a
<script> <script>
/* eslint-disable vue/no-v-html */ import {
import { GlFormGroup, GlButton, GlModal, GlToast, GlToggle, GlLink } from '@gitlab/ui'; GlFormGroup,
GlButton,
GlModal,
GlToast,
GlToggle,
GlLink,
GlSafeHtmlDirective,
} from '@gitlab/ui';
import Vue from 'vue'; import Vue from 'vue';
import { mapState, mapActions } from 'vuex'; import { mapState, mapActions } from 'vuex';
import { helpPagePath } from '~/helpers/help_page_helper'; import { helpPagePath } from '~/helpers/help_page_helper';
...@@ -18,6 +25,9 @@ export default { ...@@ -18,6 +25,9 @@ export default {
GlToggle, GlToggle,
GlLink, GlLink,
}, },
directives: {
SafeHtml: GlSafeHtmlDirective,
},
formLabels: { formLabels: {
createProject: __('Self monitoring'), createProject: __('Self monitoring'),
}, },
...@@ -137,7 +147,7 @@ export default { ...@@ -137,7 +147,7 @@ export default {
</div> </div>
<div class="settings-content"> <div class="settings-content">
<form name="self-monitoring-form"> <form name="self-monitoring-form">
<p ref="selfMonitoringFormText" v-html="selfMonitoringFormText"></p> <p ref="selfMonitoringFormText" v-safe-html="selfMonitoringFormText"></p>
<gl-form-group> <gl-form-group>
<gl-toggle <gl-toggle
v-model="selfMonitorEnabled" v-model="selfMonitorEnabled"
......
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