summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/behaviors/markdown
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-12-09 12:07:58 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-12-09 12:07:58 +0000
commit93c6764dacd4c605027ef1cd367d3aebe420b223 (patch)
tree5213b1fc874ee3e31701a81007f97d7664b95205 /app/assets/javascripts/behaviors/markdown
parentaa10b541b6a3fbc7fa712abcc59d073fc8dc620a (diff)
downloadgitlab-ce-93c6764dacd4c605027ef1cd367d3aebe420b223.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/gfm_auto_complete.js2
-rw-r--r--app/assets/javascripts/behaviors/markdown/nodes/image.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/behaviors/markdown/gfm_auto_complete.js b/app/assets/javascripts/behaviors/markdown/gfm_auto_complete.js
index b7200150925..6bbd2133344 100644
--- a/app/assets/javascripts/behaviors/markdown/gfm_auto_complete.js
+++ b/app/assets/javascripts/behaviors/markdown/gfm_auto_complete.js
@@ -1,6 +1,6 @@
import $ from 'jquery';
-import { parseBoolean } from '~/lib/utils/common_utils';
import GfmAutoComplete from 'ee_else_ce/gfm_auto_complete';
+import { parseBoolean } from '~/lib/utils/common_utils';
export default function initGFMInput() {
$('.js-gfm-input:not(.js-vue-textarea)').each((i, el) => {
diff --git a/app/assets/javascripts/behaviors/markdown/nodes/image.js b/app/assets/javascripts/behaviors/markdown/nodes/image.js
index c225a5ed876..e839396330e 100644
--- a/app/assets/javascripts/behaviors/markdown/nodes/image.js
+++ b/app/assets/javascripts/behaviors/markdown/nodes/image.js
@@ -1,8 +1,8 @@
/* eslint-disable class-methods-use-this */
import { Image as BaseImage } from 'tiptap-extensions';
-import { placeholderImage } from '~/lazy_loader';
import { defaultMarkdownSerializer } from 'prosemirror-markdown';
+import { placeholderImage } from '~/lazy_loader';
export default class Image extends BaseImage {
get schema() {