summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-09-05 12:56:03 +0100
committerPhil Hughes <me@iamphill.com>2018-09-05 12:56:03 +0100
commit3d89d20a6263fc58f00a28e63db65c7a2c28068a (patch)
treef4868e20f4e33fe822dbae195e833391e4ff25c2
parent4fab6fc035102ef3c08704f2f499d02d20206db8 (diff)
downloadgitlab-ce-3d89d20a6263fc58f00a28e63db65c7a2c28068a.tar.gz
Upgraded Monaco editor version
-rw-r--r--changelogs/unreleased/monaco-upgrade.yml5
-rw-r--r--package.json4
-rw-r--r--yarn.lock12
3 files changed, 13 insertions, 8 deletions
diff --git a/changelogs/unreleased/monaco-upgrade.yml b/changelogs/unreleased/monaco-upgrade.yml
new file mode 100644
index 00000000000..ec441ba182b
--- /dev/null
+++ b/changelogs/unreleased/monaco-upgrade.yml
@@ -0,0 +1,5 @@
+---
+title: Upgrade Monaco editor
+merge_request:
+author:
+type: other
diff --git a/package.json b/package.json
index 17ff85c9cd0..7e6ddf0fca7 100644
--- a/package.json
+++ b/package.json
@@ -69,8 +69,8 @@
"jszip-utils": "^0.0.2",
"katex": "^0.8.3",
"marked": "^0.3.12",
- "monaco-editor": "0.13.1",
- "monaco-editor-webpack-plugin": "^1.4.0",
+ "monaco-editor": "^0.14.3",
+ "monaco-editor-webpack-plugin": "^1.5.2",
"mousetrap": "^1.4.6",
"pikaday": "^1.6.1",
"popper.js": "^1.14.3",
diff --git a/yarn.lock b/yarn.lock
index db3b0bbe573..6f96e5ff228 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5274,13 +5274,13 @@ moment@2.x, moment@^2.18.1:
version "2.19.2"
resolved "https://registry.yarnpkg.com/moment/-/moment-2.19.2.tgz#8a7f774c95a64550b4c7ebd496683908f9419dbe"
-monaco-editor-webpack-plugin@^1.4.0:
- version "1.4.0"
- resolved "https://registry.yarnpkg.com/monaco-editor-webpack-plugin/-/monaco-editor-webpack-plugin-1.4.0.tgz#7324258ab3695464cfe3bc12edb2e8c55b80d92f"
+monaco-editor-webpack-plugin@^1.5.2:
+ version "1.5.2"
+ resolved "https://registry.yarnpkg.com/monaco-editor-webpack-plugin/-/monaco-editor-webpack-plugin-1.5.2.tgz#e113fa1d5759ede6fd776eb620cdd5930203b55a"
-monaco-editor@0.13.1:
- version "0.13.1"
- resolved "https://registry.yarnpkg.com/monaco-editor/-/monaco-editor-0.13.1.tgz#6b9ce20e4d1c945042d256825eb133cb23315a52"
+monaco-editor@^0.14.3:
+ version "0.14.3"
+ resolved "https://registry.yarnpkg.com/monaco-editor/-/monaco-editor-0.14.3.tgz#7cc4a4096a3821f52fea9b10489b527ef3034e22"
mousetrap@^1.4.6:
version "1.4.6"