Add latest changes from gitlab-org/gitlab@13-1-stable-ee

1 files changed, 10 insertions, 2 deletions

diff --git a/app/assets/javascripts/ide/components/ide_status_list.vue b/app/assets/javascripts/ide/components/ide_status_list.vue
index 364e3f081a1..92d25709bd5 100644
--- a/app/assets/javascripts/ide/components/ide_status_list.vue
+++ b/app/assets/javascripts/ide/components/ide_status_list.vue
@@ -1,9 +1,17 @@
 <script>
 import { mapGetters } from 'vuex';
+import TerminalSyncStatusSafe from './terminal_sync/terminal_sync_status_safe.vue';
+import { getFileEOL } from '../utils';
 
 export default {
+  components: {
+    TerminalSyncStatusSafe,
+  },
   computed: {
     ...mapGetters(['activeFile']),
+    activeFileEOL() {
+      return getFileEOL(this.activeFile.content);
+    },
   },
 };
 </script>
@@ -12,12 +20,12 @@ export default {
   <div class="ide-status-list d-flex">
     <template v-if="activeFile">
       <div class="ide-status-file">{{ activeFile.name }}</div>
-      <div class="ide-status-file">{{ activeFile.eol }}</div>
+      <div class="ide-status-file">{{ activeFileEOL }}</div>
       <div v-if="!activeFile.binary" class="ide-status-file">
         {{ activeFile.editorRow }}:{{ activeFile.editorColumn }}
       </div>
       <div class="ide-status-file">{{ activeFile.fileLanguage }}</div>
     </template>
-    <slot></slot>
+    <terminal-sync-status-safe />
   </div>
 </template>