kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch '48661-node-6-and-7-compatibility-broken-by-recent-monaco-editor-upgrade' into 'master'

Browse source 
Resolve "Node 6 and 7 compatibility broken by recent Monaco editor upgrade"

Closes #48661

See merge request gitlab-org/gitlab-ce!20461
This commit is contained in:
Tim Zallmann 2018-07-07 08:53:10 +00:00
commit d32d8bae67
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
changelogs/unreleased/48661-node-6-and-7-compatibility-broken-by-recent-monaco-editor-upgrade.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: Resolve compatibility issues with node 6
merge_request: 20461
author:
type: fixed

2
package.json
View file

@ -66,7 +66,7 @@
"katex": "^0.8.3", "katex": "^0.8.3",
"marked": "^0.3.12", "marked": "^0.3.12",
"monaco-editor": "0.13.1", "monaco-editor": "0.13.1",
"monaco-editor-webpack-plugin": "^1.2.1", "monaco-editor-webpack-plugin": "^1.4.0",
"mousetrap": "^1.4.6", "mousetrap": "^1.4.6",
"pikaday": "^1.6.1", "pikaday": "^1.6.1",
"popper.js": "^1.14.3", "popper.js": "^1.14.3",

6
yarn.lock
View file

@ -5272,9 +5272,9 @@ moment@2.x, moment@^2.18.1:
version "2.19.2" version "2.19.2"
resolved "https://registry.yarnpkg.com/moment/-/moment-2.19.2.tgz#8a7f774c95a64550b4c7ebd496683908f9419dbe" resolved "https://registry.yarnpkg.com/moment/-/moment-2.19.2.tgz#8a7f774c95a64550b4c7ebd496683908f9419dbe"
monaco-editor-webpack-plugin@^1.2.1: monaco-editor-webpack-plugin@^1.4.0:
version "1.2.1" version "1.4.0"
resolved "https://registry.yarnpkg.com/monaco-editor-webpack-plugin/-/monaco-editor-webpack-plugin-1.2.1.tgz#577ed091420f422bb8f0ff3a8899dd82344da56d" resolved "https://registry.yarnpkg.com/monaco-editor-webpack-plugin/-/monaco-editor-webpack-plugin-1.4.0.tgz#7324258ab3695464cfe3bc12edb2e8c55b80d92f"
monaco-editor@0.13.1: monaco-editor@0.13.1:
version "0.13.1" version "0.13.1"