diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-19 12:07:35 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-19 12:07:35 +0000 |
commit | e3764d340e2849fccee8c06278d1f5f686edd35b (patch) | |
tree | 23de7fe0eaa58a82c3a72eb8ff4a195e24627eb7 /package.json | |
parent | e3d67bcff7b8bc6a453d0814d404a9a61d97bc0f (diff) | |
download | gitlab-ce-e3764d340e2849fccee8c06278d1f5f686edd35b.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'package.json')
-rw-r--r-- | package.json | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/package.json b/package.json index 58656d27816..87bbc0caf4f 100644 --- a/package.json +++ b/package.json @@ -95,7 +95,7 @@ "katex": "^0.10.0", "marked": "^0.3.12", "mermaid": "^8.4.2", - "monaco-editor": "^0.15.6", + "monaco-editor": "^0.18.1", "monaco-editor-webpack-plugin": "^1.7.0", "mousetrap": "^1.4.6", "pdfjs-dist": "^2.0.943", @@ -200,7 +200,8 @@ "yarn-deduplicate": "^1.1.1" }, "resolutions": { - "vue-jest/ts-jest": "24.0.0" + "vue-jest/ts-jest": "24.0.0", + "monaco-editor" : "0.18.1" }, "engines": { "node": ">=8.10.0", |