Automatic merge of gitlab-org/gitlab-ce master

app/assets/javascripts/ide/lib/common/model.js

@@ -13,12 +13,12 @@ export default class Model {
       (this.originalModel = monacoEditor.createModel(
         head ? head.content : this.file.raw,
         undefined,
-        new Uri(false, false, `original/${this.path}`),
+        new Uri('gitlab', false, `original/${this.path}`),
       )),
       (this.model = monacoEditor.createModel(
         this.content,
         undefined,
-        new Uri(false, false, this.path),
+        new Uri('gitlab', false, this.path),
       )),
     );
     if (this.file.mrChange) {
@@ -26,7 +26,7 @@ export default class Model {
         (this.baseModel = monacoEditor.createModel(
           this.file.baseRaw,
           undefined,
-          new Uri(false, false, `target/${this.path}`),
+          new Uri('gitlab', false, `target/${this.path}`),
         )),
       );
     }

package.json

@@ -81,8 +81,8 @@
     "katex": "^0.10.0",
     "marked": "^0.3.12",
     "mermaid": "^8.0.0-rc.8",
-    "monaco-editor": "^0.14.3",
-    "monaco-editor-webpack-plugin": "^1.5.4",
+    "monaco-editor": "^0.15.6",
+    "monaco-editor-webpack-plugin": "^1.7.0",
     "mousetrap": "^1.4.6",
     "pikaday": "^1.6.1",
     "popper.js": "^1.14.3",
@@ -114,7 +114,7 @@
     "vue-template-compiler": "^2.5.21",
     "vue-virtual-scroll-list": "^1.2.5",
     "vuex": "^3.0.1",
-    "webpack": "^4.28.1",
+    "webpack": "^4.29.0",
     "webpack-bundle-analyzer": "^3.0.3",
     "webpack-cli": "^3.2.1",
     "webpack-stats-plugin": "^0.2.1",
@@ -162,12 +162,12 @@
     "karma-mocha-reporter": "^2.2.5",
     "karma-sourcemap-loader": "^0.3.7",
     "karma-webpack": "^4.0.0-beta.0",
-    "nodemon": "^1.18.4",
+    "nodemon": "^1.18.9",
     "pixelmatch": "^4.0.2",
     "prettier": "1.16.1",
     "vue-jest": "^3.0.2",
     "webpack-dev-server": "^3.1.14",
-    "yarn-deduplicate": "^1.0.5"
+    "yarn-deduplicate": "^1.1.0"
   },
   "engines": {
     "node": ">=8.10.0",

spec/javascripts/ide/lib/decorations/controller_spec.js

@@ -56,7 +56,7 @@ describe('Multi-file editor library decorations controller', () => {
       controller.addDecorations(model, 'key', [{ decoration: 'decorationValue' }]);
 
       expect(controller.decorations.size).toBe(1);
-      expect(controller.decorations.keys().next().value).toBe('path--path');
+      expect(controller.decorations.keys().next().value).toBe('gitlab:path--path');
     });
 
     it('calls decorate method', () => {
@@ -90,7 +90,7 @@ describe('Multi-file editor library decorations controller', () => {
 
       controller.decorate(model);
 
-      expect(controller.editorDecorations.keys().next().value).toBe('path--path');
+      expect(controller.editorDecorations.keys().next().value).toBe('gitlab:path--path');
     });
   });