Add latest changes from gitlab-org/gitlab@master

1 files changed, 8 insertions, 2 deletions

diff --git a/app/assets/javascripts/editor/extensions/editor_ci_schema_ext.js b/app/assets/javascripts/editor/extensions/editor_ci_schema_ext.js
index 05d938c57ce..eb47c20912e 100644
--- a/app/assets/javascripts/editor/extensions/editor_ci_schema_ext.js
+++ b/app/assets/javascripts/editor/extensions/editor_ci_schema_ext.js
@@ -17,15 +17,21 @@ export class CiSchemaExtension extends EditorLiteExtension {
    * @param {String?} opts.ref - Current ref. Defaults to master
    */
   registerCiSchema({ projectNamespace, projectPath, ref = 'master' } = {}) {
-    const ciSchemaUri = Api.buildUrl(Api.projectFileSchemaPath)
+    const ciSchemaPath = Api.buildUrl(Api.projectFileSchemaPath)
       .replace(':namespace_path', projectNamespace)
       .replace(':project_path', projectPath)
       .replace(':ref', ref)
       .replace(':filename', EXTENSION_CI_SCHEMA_FILE_NAME_MATCH);
+    // In order for workers loaded from `data://` as the
+    // ones loaded by monaco editor, we use absolute URLs
+    // to fetch schema files, hence the `gon.gitlab_url`
+    // reference. This prevents error:
+    //   "Failed to execute 'fetch' on 'WorkerGlobalScope'"
+    const absoluteSchemaUrl = gon.gitlab_url + ciSchemaPath;
     const modelFileName = this.getModel().uri.path.split('/').pop();
 
     registerSchema({
-      uri: ciSchemaUri,
+      uri: absoluteSchemaUrl,
       fileMatch: [modelFileName],
     });
   }