Add latest changes from gitlab-org/gitlab@master

2 files changed, 12 insertions, 12 deletions

diff --git a/app/assets/javascripts/ide/lib/editor.js b/app/assets/javascripts/ide/lib/editor.js
index 4f2564556f8..80191f635a3 100644
--- a/app/assets/javascripts/ide/lib/editor.js
+++ b/app/assets/javascripts/ide/lib/editor.js
@@ -184,7 +184,7 @@ export default class Editor {
     if (!this.isDiffEditorType) return;
 
     this.instance.updateOptions({
-      renderSideBySide: Editor.renderSideBySide(this.instance.getContainerDomNode()),
+      renderSideBySide: Editor.renderSideBySide(this.instance.getDomNode()),
     });
   }
 
diff --git a/app/assets/javascripts/ide/utils.js b/app/assets/javascripts/ide/utils.js
index 83a3d7f2ac3..a7e6506b045 100644
--- a/app/assets/javascripts/ide/utils.js
+++ b/app/assets/javascripts/ide/utils.js
@@ -1,6 +1,5 @@
 import { flatten, isString } from 'lodash';
 import { languages } from 'monaco-editor';
-import { setDiagnosticsOptions as yamlDiagnosticsOptions } from 'monaco-yaml';
 import { performanceMarkAndMeasure } from '~/performance/utils';
 import { SIDE_LEFT, SIDE_RIGHT } from './constants';
 
@@ -83,16 +82,17 @@ export function registerLanguages(def, ...defs) {
 }
 
 export function registerSchema(schema, options = {}) {
-  const defaultOptions = {
-    validate: true,
-    enableSchemaRequest: true,
-    hover: true,
-    completion: true,
-    schemas: [schema],
-    ...options,
-  };
-  languages.json.jsonDefaults.setDiagnosticsOptions(defaultOptions);
-  yamlDiagnosticsOptions(defaultOptions);
+  const defaults = [languages.json.jsonDefaults, languages.yaml.yamlDefaults];
+  defaults.forEach((d) =>
+    d.setDiagnosticsOptions({
+      validate: true,
+      enableSchemaRequest: true,
+      hover: true,
+      completion: true,
+      schemas: [schema],
+      ...options,
+    }),
+  );
 }
 
 export const otherSide = (side) => (side === SIDE_RIGHT ? SIDE_LEFT : SIDE_RIGHT);