summaryrefslogtreecommitdiff
path: root/package.json
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2017-10-16 14:48:45 +0000
committerJacob Schatz <jschatz@gitlab.com>2017-10-16 14:48:45 +0000
commitb69861c204a6295a413802255f18606bb8c71db9 (patch)
treebc27af69e9a35f7cbcbb0392b7e3bfd577ed39ab /package.json
parent42a69d7522ea0d5efc16b202a3d110ca00185a6e (diff)
parent077ecf8a80733878fd35a407bdd623273598c3e2 (diff)
downloadgitlab-ce-b69861c204a6295a413802255f18606bb8c71db9.tar.gz
Merge branch 'ide-update-monaco' into 'master'
Upgrading Monaco Closes #38607 See merge request gitlab-org/gitlab-ce!14629
Diffstat (limited to 'package.json')
-rw-r--r--package.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/package.json b/package.json
index b670415deb4..620b39766f4 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
"jszip": "^3.1.3",
"jszip-utils": "^0.0.2",
"marked": "^0.3.6",
- "monaco-editor": "0.8.3",
+ "monaco-editor": "0.10.0",
"mousetrap": "^1.4.6",
"name-all-modules-plugin": "^1.0.1",
"pikaday": "^1.5.1",