diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-23 06:09:45 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-23 06:09:45 +0000 |
| commit | 86fa823611b3ab5701d144aca1c57c51b4af25d5 (patch) | |
| tree | ae6b2858c282d6f0cd2763135ef32f564c9295e8 /app/assets/javascripts/cycle_analytics | |
| parent | 8007620dc7216ff2b9e7dde0aa88e6f47fc433e7 (diff) | |
| download | gitlab-ce-86fa823611b3ab5701d144aca1c57c51b4af25d5.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/cycle_analytics')
| -rw-r--r-- | app/assets/javascripts/cycle_analytics/components/stage_staging_component.vue | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/app/assets/javascripts/cycle_analytics/components/stage_staging_component.vue b/app/assets/javascripts/cycle_analytics/components/stage_staging_component.vue index ba2be2e5167..6530bfd72a9 100644 --- a/app/assets/javascripts/cycle_analytics/components/stage_staging_component.vue +++ b/app/assets/javascripts/cycle_analytics/components/stage_staging_component.vue @@ -1,6 +1,5 @@ <script> -/* eslint-disable vue/no-v-html */ -import { GlIcon } from '@gitlab/ui'; +import { GlIcon, GlSafeHtmlDirective as SafeHtml } from '@gitlab/ui'; import userAvatarImage from '../../vue_shared/components/user_avatar/user_avatar_image.vue'; import iconBranch from '../svg/icon_branch.svg'; import limitWarning from './limit_warning_component.vue'; @@ -13,6 +12,9 @@ export default { limitWarning, GlIcon, }, + directives: { + SafeHtml, + }, props: { items: { type: Array, @@ -47,7 +49,7 @@ export default { <a :href="build.url" class="pipeline-id"> #{{ build.id }} </a> <gl-icon :size="16" name="fork" /> <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> </h5> <span> |