diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-21 00:11:31 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-21 00:11:31 +0300 |
commit | cfd505b1984183857fcfeab259c5a38791205914 (patch) | |
tree | 816c1ca2c84eeb9f6faf8bf15162703b48ba918f /app/assets | |
parent | 813226e2ba738fd7157e7014e1a115557a25b172 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/javascripts/repository/components/table/row.vue | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/assets/javascripts/repository/components/table/row.vue b/app/assets/javascripts/repository/components/table/row.vue index 009dd19b4a5..09b80a8ef8e 100644 --- a/app/assets/javascripts/repository/components/table/row.vue +++ b/app/assets/javascripts/repository/components/table/row.vue @@ -7,6 +7,7 @@ import { GlLoadingIcon, GlIcon, GlHoverLoadDirective, + GlSafeHtmlDirective, } from '@gitlab/ui'; import { escapeRegExp } from 'lodash'; import filesQuery from 'shared_queries/repository/files.query.graphql'; @@ -33,6 +34,7 @@ export default { directives: { GlTooltip: GlTooltipDirective, GlHoverLoad: GlHoverLoadDirective, + SafeHtml: GlSafeHtmlDirective, }, apollo: { commit: { @@ -178,6 +180,7 @@ export default { this.$apollo.query({ query, variables }); }, }, + safeHtmlConfig: { ADD_TAGS: ['gl-emoji'] }, }; </script> @@ -228,10 +231,10 @@ export default { <td class="d-none d-sm-table-cell tree-commit cursor-default"> <gl-link v-if="commit" + v-safe-html:[$options.safeHtmlConfig]="commit.titleHtml" :href="commit.commitPath" :title="commit.message" class="str-truncated-100 tree-commit-link" - v-html="commit.titleHtml /* eslint-disable-line vue/no-v-html */" /> <gl-skeleton-loading v-else :lines="1" class="h-auto" /> </td> |