Add latest changes from gitlab-org/gitlab@master

2 files changed, 2 insertions, 2 deletions

diff --git a/app/assets/javascripts/editor/extensions/source_editor_webide_ext.js b/app/assets/javascripts/editor/extensions/source_editor_webide_ext.js
index 6270517b3f3..bacc05af3f1 100644
--- a/app/assets/javascripts/editor/extensions/source_editor_webide_ext.js
+++ b/app/assets/javascripts/editor/extensions/source_editor_webide_ext.js
@@ -60,7 +60,7 @@ const renderSideBySide = (domElement) => {
 
 const updateDiffInstanceRendering = (instance) => {
   instance.updateOptions({
-    renderSideBySide: renderSideBySide(instance.getDomNode()),
+    renderSideBySide: renderSideBySide(instance.getContainerDomNode()),
   });
 };
 
diff --git a/app/assets/javascripts/editor/utils.js b/app/assets/javascripts/editor/utils.js
index df9d3f2b9fb..cb38ccf0043 100644
--- a/app/assets/javascripts/editor/utils.js
+++ b/app/assets/javascripts/editor/utils.js
@@ -26,7 +26,7 @@ export const getBlobLanguage = (blobPath) => {
   const ext = `.${blobPath.split('.').pop()}`;
   const language = monacoLanguages
     .getLanguages()
-    .find((lang) => lang.extensions.indexOf(ext) !== -1);
+    .find((lang) => lang.extensions?.indexOf(ext) >= 0);
   return language ? language.id : defaultLanguage;
 };