diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2018-07-07 08:53:10 +0000 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2018-07-07 08:53:10 +0000 |
| commit | d32d8bae670668f871d9ab968a3f9b88a9378ebd (patch) | |
| tree | f144e2b2abe04045fb1bda3659ecfc7a62990df0 | |
| parent | 29d08196f0c3bc24d8f2ad2025a58e590645cd3e (diff) | |
| parent | 624baba4896838078779e825b85a538c11389c8a (diff) | |
| download | gitlab-ce-d32d8bae670668f871d9ab968a3f9b88a9378ebd.tar.gz | |
Merge branch '48661-node-6-and-7-compatibility-broken-by-recent-monaco-editor-upgrade' into 'master'
Resolve "Node 6 and 7 compatibility broken by recent Monaco editor upgrade"
Closes #48661
See merge request gitlab-org/gitlab-ce!20461
| -rw-r--r-- | changelogs/unreleased/48661-node-6-and-7-compatibility-broken-by-recent-monaco-editor-upgrade.yml | 5 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | yarn.lock | 6 |
3 files changed, 9 insertions, 4 deletions
diff --git a/changelogs/unreleased/48661-node-6-and-7-compatibility-broken-by-recent-monaco-editor-upgrade.yml b/changelogs/unreleased/48661-node-6-and-7-compatibility-broken-by-recent-monaco-editor-upgrade.yml new file mode 100644 index 00000000000..36a4b5f754d --- /dev/null +++ b/changelogs/unreleased/48661-node-6-and-7-compatibility-broken-by-recent-monaco-editor-upgrade.yml @@ -0,0 +1,5 @@ +--- +title: Resolve compatibility issues with node 6 +merge_request: 20461 +author: +type: fixed diff --git a/package.json b/package.json index 1fce5d7623d..26b87c70e98 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "katex": "^0.8.3", "marked": "^0.3.12", "monaco-editor": "0.13.1", - "monaco-editor-webpack-plugin": "^1.2.1", + "monaco-editor-webpack-plugin": "^1.4.0", "mousetrap": "^1.4.6", "pikaday": "^1.6.1", "popper.js": "^1.14.3", diff --git a/yarn.lock b/yarn.lock index 5df2a9a2eb8..d844ae4f8e9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5272,9 +5272,9 @@ 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.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/monaco-editor-webpack-plugin/-/monaco-editor-webpack-plugin-1.2.1.tgz#577ed091420f422bb8f0ff3a8899dd82344da56d" +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@0.13.1: version "0.13.1" |