diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-24 00:09:46 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-24 00:09:46 +0300 |
| commit | 8a7aaf86831d2a556578ae558a4fcab8bb659b20 (patch) | |
| tree | 61c2b55aa48ff8e853e546cd3009dfc5423279c8 /app/assets/javascripts/vue_shared/components/markdown | |
| parent | 967812838c7e7742729a4c7aeb9859f98a509622 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_shared/components/markdown')
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/markdown/field.vue | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/vue_shared/components/markdown/field.vue b/app/assets/javascripts/vue_shared/components/markdown/field.vue index e30876813c2..26e878d56a0 100644 --- a/app/assets/javascripts/vue_shared/components/markdown/field.vue +++ b/app/assets/javascripts/vue_shared/components/markdown/field.vue @@ -1,7 +1,7 @@ <script> import $ from 'jquery'; import '~/behaviors/markdown/render_gfm'; -import _ from 'underscore'; +import { unescape as unesc } from 'lodash'; import { __, sprintf } from '~/locale'; import { stripHtml } from '~/lib/utils/text_utility'; import Flash from '../../../flash'; @@ -115,7 +115,7 @@ export default { return text; } - return _.unescape(stripHtml(richText).replace(/\n/g, '')); + return unesc(stripHtml(richText).replace(/\n/g, '')); } return ''; |