Commit c1949330 authored by Vitaly Slobodin's avatar Vitaly Slobodin

Merge branch...

Merge branch '241927-remove-v-html-from-app-assets-javascripts-serverless-components-functions-vue' into 'master'

Remove v-html from app/assets/javascripts/serverless/components/functions.vue

Closes #241927

See merge request gitlab-org/gitlab!41507
parents 4c001105 4eb635d6
<script> <script>
/* eslint-disable vue/no-v-html */
import { mapState, mapActions, mapGetters } from 'vuex'; import { mapState, mapActions, mapGetters } from 'vuex';
import { GlLink, GlLoadingIcon } from '@gitlab/ui'; import { GlLink, GlLoadingIcon, GlSafeHtmlDirective as SafeHtml } from '@gitlab/ui';
import { sprintf, s__ } from '~/locale'; import { sprintf, s__ } from '~/locale';
import EnvironmentRow from './environment_row.vue'; import EnvironmentRow from './environment_row.vue';
import EmptyState from './empty_state.vue'; import EmptyState from './empty_state.vue';
...@@ -14,6 +13,9 @@ export default { ...@@ -14,6 +13,9 @@ export default {
GlLink, GlLink,
GlLoadingIcon, GlLoadingIcon,
}, },
directives: {
SafeHtml,
},
computed: { computed: {
...mapState(['installed', 'isLoading', 'hasFunctionData', 'helpPath', 'statusPath']), ...mapState(['installed', 'isLoading', 'hasFunctionData', 'helpPath', 'statusPath']),
...mapGetters(['getFunctions']), ...mapGetters(['getFunctions']),
...@@ -92,9 +94,9 @@ export default { ...@@ -92,9 +94,9 @@ export default {
}} }}
</p> </p>
<ul> <ul>
<li v-html="noServerlessConfigFile"></li> <li v-safe-html="noServerlessConfigFile"></li>
<li v-html="noGitlabYamlConfigured"></li> <li v-safe-html="noGitlabYamlConfigured"></li>
<li v-html="mismatchedServerlessFunctions"></li> <li v-safe-html="mismatchedServerlessFunctions"></li>
<li>{{ s__('Serverless|The deploy job has not finished.') }}</li> <li>{{ s__('Serverless|The deploy job has not finished.') }}</li>
</ul> </ul>
......
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