diff options
author | Phil Hughes <me@iamphill.com> | 2018-01-16 09:13:57 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2018-01-16 09:13:57 +0000 |
commit | 547b458e254bdb271d8ff41e62217fa7f3cf9c87 (patch) | |
tree | 64b3a0944f1b649d93772a48d78c6ea63ee75710 | |
parent | 5abdcf1be9fec29d14c1d5e7a9cc0aef2edaeff9 (diff) | |
parent | 0abb37923055f82e7c4329b026434cc0b56f9fea (diff) | |
download | gitlab-ce-547b458e254bdb271d8ff41e62217fa7f3cf9c87.tar.gz |
Merge branch '42055-update-marked-from-0.3.6-to-0.3.12' into 'master'
Update marked to 0.3.12
Closes #42055
See merge request gitlab-org/gitlab-ce!16480
-rw-r--r-- | changelogs/unreleased/42055-update-marked-from-0-3-6-to-0-3-12.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/42055-update-marked-from-0-3-6-to-0-3-12.yml b/changelogs/unreleased/42055-update-marked-from-0-3-6-to-0-3-12.yml new file mode 100644 index 00000000000..2b043761856 --- /dev/null +++ b/changelogs/unreleased/42055-update-marked-from-0-3-6-to-0-3-12.yml @@ -0,0 +1,5 @@ +--- +title: Update marked from 0.3.6 to 0.3.12 +merge_request: 16480 +author: Takuya Noguchi +type: security diff --git a/package.json b/package.json index 4759ae76817..35c145aaebe 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "js-cookie": "^2.1.3", "jszip": "^3.1.3", "jszip-utils": "^0.0.2", - "marked": "^0.3.6", + "marked": "^0.3.12", "monaco-editor": "0.10.0", "mousetrap": "^1.4.6", "name-all-modules-plugin": "^1.0.1", diff --git a/yarn.lock b/yarn.lock index 5d40e833889..64b66ee446a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4191,9 +4191,9 @@ map-stream@~0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.1.0.tgz#e56aa94c4c8055a16404a0674b78f215f7c8e194" -marked@^0.3.6: - version "0.3.6" - resolved "https://registry.yarnpkg.com/marked/-/marked-0.3.6.tgz#b2c6c618fccece4ef86c4fc6cb8a7cbf5aeda8d7" +marked@^0.3.12: + version "0.3.12" + resolved "https://registry.yarnpkg.com/marked/-/marked-0.3.12.tgz#7cf25ff2252632f3fe2406bde258e94eee927519" math-expression-evaluator@^1.2.14: version "1.2.16" |