summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/behaviors/markdown
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-17 06:08:55 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-17 06:08:55 +0000
commitcfe63cce6a90a1c70397c1b9f6d90480f25cae0a (patch)
treeedd6c21505a2f6afc8c6c6b9e69e6233a045c95b /app/assets/javascripts/behaviors/markdown
parent56201db1dc66f3a2d598f6f8da0bec170dc26ba1 (diff)
downloadgitlab-ce-cfe63cce6a90a1c70397c1b9f6d90480f25cae0a.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/behaviors/markdown')
-rw-r--r--app/assets/javascripts/behaviors/markdown/marks/inline_html.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/behaviors/markdown/marks/inline_html.js b/app/assets/javascripts/behaviors/markdown/marks/inline_html.js
index ebed8698e21..7e020139fe7 100644
--- a/app/assets/javascripts/behaviors/markdown/marks/inline_html.js
+++ b/app/assets/javascripts/behaviors/markdown/marks/inline_html.js
@@ -1,7 +1,7 @@
/* eslint-disable class-methods-use-this */
import { Mark } from 'tiptap';
-import _ from 'underscore';
+import { escape as esc } from 'lodash';
// Transforms generated HTML back to GFM for Banzai::Filter::MarkdownFilter
export default class InlineHTML extends Mark {
@@ -35,7 +35,7 @@ export default class InlineHTML extends Mark {
mixable: true,
open(state, mark) {
return `<${mark.attrs.tag}${
- mark.attrs.title ? ` title="${state.esc(_.escape(mark.attrs.title))}"` : ''
+ mark.attrs.title ? ` title="${state.esc(esc(mark.attrs.title))}"` : ''
}>`;
},
close(state, mark) {