diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-05 12:12:23 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-05 12:12:23 +0300 |
commit | e0c90aab261896abcf93f3806d965790dbd03408 (patch) | |
tree | 72524feb8405807c5122cf788976fa6fd09fae3f /app | |
parent | 7e254c1556243adc62436a0b929fbeff7e8daf52 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/vue_shared/components/issue/related_issuable_item.vue | 13 | ||||
-rw-r--r-- | app/views/layouts/nav/_breadcrumbs.html.haml | 2 |
2 files changed, 11 insertions, 4 deletions
diff --git a/app/assets/javascripts/vue_shared/components/issue/related_issuable_item.vue b/app/assets/javascripts/vue_shared/components/issue/related_issuable_item.vue index 095d1854c8b..8aeff9257a5 100644 --- a/app/assets/javascripts/vue_shared/components/issue/related_issuable_item.vue +++ b/app/assets/javascripts/vue_shared/components/issue/related_issuable_item.vue @@ -1,6 +1,12 @@ <script> import '~/commons/bootstrap'; -import { GlIcon, GlTooltip, GlTooltipDirective, GlButton } from '@gitlab/ui'; +import { + GlIcon, + GlTooltip, + GlTooltipDirective, + GlButton, + GlSafeHtmlDirective as SafeHtml, +} from '@gitlab/ui'; import IssueDueDate from '~/boards/components/issue_due_date.vue'; import { sprintf } from '~/locale'; import relatedIssuableMixin from '../../mixins/related_issuable_mixin'; @@ -22,6 +28,7 @@ export default { }, directives: { GlTooltip: GlTooltipDirective, + SafeHtml, }, mixins: [relatedIssuableMixin], props: { @@ -84,7 +91,7 @@ export default { /> </div> <gl-tooltip :target="() => $refs.iconElementXL"> - <span v-html="stateTitle /* eslint-disable-line vue/no-v-html */"></span> + <span v-safe-html="stateTitle"></span> </gl-tooltip> <gl-icon v-if="confidential" @@ -110,7 +117,7 @@ export default { class="item-path-area item-path-id d-flex align-items-center mr-2 mt-2 mt-xl-0 ml-xl-2" > <gl-tooltip :target="() => this.$refs.iconElement"> - <span v-html="stateTitle /* eslint-disable-line vue/no-v-html */"></span> + <span v-safe-html="stateTitle"></span> </gl-tooltip> <span v-gl-tooltip :title="itemPath" class="path-id-text d-inline-block">{{ itemPath diff --git a/app/views/layouts/nav/_breadcrumbs.html.haml b/app/views/layouts/nav/_breadcrumbs.html.haml index c111714f552..3678ec748f7 100644 --- a/app/views/layouts/nav/_breadcrumbs.html.haml +++ b/app/views/layouts/nav/_breadcrumbs.html.haml @@ -19,7 +19,7 @@ = render "layouts/nav/breadcrumbs/collapsed_dropdown", location: :after - unless @skip_current_level_breadcrumb %li - %h2.breadcrumbs-sub-title + %h2.breadcrumbs-sub-title{ data: { qa_selector: 'breadcrumb_sub_title_content' } } = link_to @breadcrumb_title, breadcrumb_title_link %script{ type: 'application/ld+json' } :plain |