diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-20 11:43:02 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-20 11:43:02 +0300 |
commit | d9ab72d6080f594d0b3cae15f14b3ef2c6c638cb (patch) | |
tree | 2341ef426af70ad1e289c38036737e04b0aa5007 /app/assets/javascripts/releases | |
parent | d6e514dd13db8947884cd58fe2a9c2a063400a9b (diff) |
Add latest changes from gitlab-org/gitlab@14-4-stable-eev14.4.0-rc42
Diffstat (limited to 'app/assets/javascripts/releases')
-rw-r--r-- | app/assets/javascripts/releases/components/release_block.vue | 10 | ||||
-rw-r--r-- | app/assets/javascripts/releases/mount_show.js | 7 |
2 files changed, 12 insertions, 5 deletions
diff --git a/app/assets/javascripts/releases/components/release_block.vue b/app/assets/javascripts/releases/components/release_block.vue index 3201ca1f443..b2bd405574f 100644 --- a/app/assets/javascripts/releases/components/release_block.vue +++ b/app/assets/javascripts/releases/components/release_block.vue @@ -1,4 +1,5 @@ <script> +import { GlSafeHtmlDirective as SafeHtml } from '@gitlab/ui'; import $ from 'jquery'; import { isEmpty } from 'lodash'; import { scrollToElement } from '~/lib/utils/common_utils'; @@ -21,6 +22,9 @@ export default { ReleaseBlockHeader, ReleaseBlockMilestoneInfo, }, + directives: { + SafeHtml, + }, mixins: [glFeatureFlagsMixin()], props: { release: { @@ -79,6 +83,7 @@ export default { $(this.$refs['gfm-content']).renderGFM(); }, }, + safeHtmlConfig: { ADD_TAGS: ['gl-emoji'] }, }; </script> <template> @@ -102,10 +107,7 @@ export default { <evidence-block v-if="hasEvidence" :release="release" /> <div ref="gfm-content" class="card-text gl-mt-3"> - <div - class="md" - v-html="release.descriptionHtml /* eslint-disable-line vue/no-v-html */" - ></div> + <div v-safe-html:[$options.safeHtmlConfig]="release.descriptionHtml" class="md"></div> </div> </div> diff --git a/app/assets/javascripts/releases/mount_show.js b/app/assets/javascripts/releases/mount_show.js index 7272880197a..686f9e294b7 100644 --- a/app/assets/javascripts/releases/mount_show.js +++ b/app/assets/javascripts/releases/mount_show.js @@ -6,7 +6,12 @@ import ReleaseShowApp from './components/app_show.vue'; Vue.use(VueApollo); const apolloProvider = new VueApollo({ - defaultClient: createDefaultClient(), + defaultClient: createDefaultClient( + {}, + { + assumeImmutableResults: true, + }, + ), }); export default () => { |