diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-23 15:27:44 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-23 15:27:44 +0300 |
| commit | dc28f8ca357c733561121acd70cb19d26880f3c2 (patch) | |
| tree | 039b02b54cad14ac17b4d1fdfdd6b8489dfa1574 /app | |
| parent | d678b7c987f082e0e15083fe7b7dbed3ed004e0c (diff) | |
Add latest changes from gitlab-org/gitlab@14-2-stable-ee
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/ide/components/repo_editor.vue | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/javascripts/ide/components/repo_editor.vue b/app/assets/javascripts/ide/components/repo_editor.vue index bf5ec849bc5..2f990280367 100644 --- a/app/assets/javascripts/ide/components/repo_editor.vue +++ b/app/assets/javascripts/ide/components/repo_editor.vue @@ -3,6 +3,7 @@ import { debounce } from 'lodash'; import { mapState, mapGetters, mapActions } from 'vuex'; import { EDITOR_TYPE_DIFF, + EDITOR_TYPE_CODE, EDITOR_CODE_INSTANCE_FN, EDITOR_DIFF_INSTANCE_FN, } from '~/editor/constants'; @@ -311,7 +312,10 @@ export default { }), ); - if (this.fileType === MARKDOWN_FILE_TYPE) { + if ( + this.fileType === MARKDOWN_FILE_TYPE && + this.editor?.getEditorType() === EDITOR_TYPE_CODE + ) { import('~/editor/extensions/source_editor_markdown_ext') .then(({ EditorMarkdownExtension: MarkdownExtension } = {}) => { this.editor.use( |