From dc28f8ca357c733561121acd70cb19d26880f3c2 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Mon, 23 Aug 2021 12:27:44 +0000
Subject: Add latest changes from gitlab-org/gitlab@14-2-stable-ee

---
 app/assets/javascripts/ide/components/repo_editor.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'app')

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(
-- 
cgit v1.2.3