From e3764d340e2849fccee8c06278d1f5f686edd35b Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Thu, 19 Dec 2019 12:07:35 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 package.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'package.json')

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",
-- 
cgit v1.2.3