Commit b6407994 authored by Kushal Pandya's avatar Kushal Pandya

Merge branch...

Merge branch '241922-remove-v-html-from-app-assets-javascripts-cycle_analytics-components-stage_staging_component' into 'master'

Remove v-html from app/assets/javascripts/cycle_analytics/components/stage_staging_component.vue

Closes #241922

See merge request gitlab-org/gitlab!41512
parents 84242d89 85141e87
<script> <script>
/* eslint-disable vue/no-v-html */ import { GlIcon, GlSafeHtmlDirective as SafeHtml } from '@gitlab/ui';
import { GlIcon } from '@gitlab/ui';
import userAvatarImage from '../../vue_shared/components/user_avatar/user_avatar_image.vue'; import userAvatarImage from '../../vue_shared/components/user_avatar/user_avatar_image.vue';
import iconBranch from '../svg/icon_branch.svg'; import iconBranch from '../svg/icon_branch.svg';
import limitWarning from './limit_warning_component.vue'; import limitWarning from './limit_warning_component.vue';
...@@ -13,6 +12,9 @@ export default { ...@@ -13,6 +12,9 @@ export default {
limitWarning, limitWarning,
GlIcon, GlIcon,
}, },
directives: {
SafeHtml,
},
props: { props: {
items: { items: {
type: Array, type: Array,
...@@ -47,7 +49,7 @@ export default { ...@@ -47,7 +49,7 @@ export default {
<a :href="build.url" class="pipeline-id"> #{{ build.id }} </a> <a :href="build.url" class="pipeline-id"> #{{ build.id }} </a>
<gl-icon :size="16" name="fork" /> <gl-icon :size="16" name="fork" />
<a :href="build.branch.url" class="ref-name"> {{ build.branch.name }} </a> <a :href="build.branch.url" class="ref-name"> {{ build.branch.name }} </a>
<span class="icon-branch" v-html="iconBranch"> </span> <span v-safe-html="iconBranch" class="icon-branch"> </span>
<a :href="build.commitUrl" class="commit-sha"> {{ build.shortSha }} </a> <a :href="build.commitUrl" class="commit-sha"> {{ build.shortSha }} </a>
</h5> </h5>
<span> <span>
......
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