summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2018-06-07 15:30:27 -0500
committerMike Greiling <mike@pixelcog.com>2018-06-07 16:35:34 -0500
commit09471ee2d220c0a6090f4d8d62525e21b67beded (patch)
tree075e42a1071fa3719b3da40c2b5dd303faf188d4
parent6d96b9dd6be8d27d3030e7a6de08ec3ba419643e (diff)
downloadgitlab-ce-09471ee2d220c0a6090f4d8d62525e21b67beded.tar.gz
fix bug in call to monaco.Uri. first param is checked with `typeof param === 'object'` which is true for `null` due to a JS quirk
-rw-r--r--app/assets/javascripts/ide/lib/common/model.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/ide/lib/common/model.js b/app/assets/javascripts/ide/lib/common/model.js
index e5149b1f3ad..ecacc11d77c 100644
--- a/app/assets/javascripts/ide/lib/common/model.js
+++ b/app/assets/javascripts/ide/lib/common/model.js
@@ -13,12 +13,12 @@ export default class Model {
(this.originalModel = this.monaco.editor.createModel(
head ? head.content : this.file.raw,
undefined,
- new this.monaco.Uri(null, null, `original/${this.path}`),
+ new this.monaco.Uri(false, false, `original/${this.path}`),
)),
(this.model = this.monaco.editor.createModel(
this.content,
undefined,
- new this.monaco.Uri(null, null, this.path),
+ new this.monaco.Uri(false, false, this.path),
)),
);
if (this.file.mrChange) {
@@ -26,7 +26,7 @@ export default class Model {
(this.baseModel = this.monaco.editor.createModel(
this.file.baseRaw,
undefined,
- new this.monaco.Uri(null, null, `target/${this.path}`),
+ new this.monaco.Uri(false, false, `target/${this.path}`),
)),
);
}