diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2017-08-31 22:19:22 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2017-08-31 22:19:22 +0000 |
| commit | 8713afe61fb1beaff4d550a60b88d274c47006ea (patch) | |
| tree | 26c5a1c5ce04f9f86d98e5692d446a83524bf70a | |
| parent | f5006d27e43754f571c01ddb3974046d7b8a25bb (diff) | |
| parent | e6adc5088ffe4e844f63f68542049b5df6cd10f9 (diff) | |
| download | gitlab-ce-8713afe61fb1beaff4d550a60b88d274c47006ea.tar.gz | |
Merge branch 'fix/npm-security-updates' into 'master'
Upgrade brace-expansion NPM package due to security issue
See merge request !13665
| -rw-r--r-- | changelogs/unreleased/fix-npm-security-updates.yml | 5 | ||||
| -rw-r--r-- | package.json | 1 | ||||
| -rw-r--r-- | yarn.lock | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/changelogs/unreleased/fix-npm-security-updates.yml b/changelogs/unreleased/fix-npm-security-updates.yml new file mode 100644 index 00000000000..faa0c3149b8 --- /dev/null +++ b/changelogs/unreleased/fix-npm-security-updates.yml @@ -0,0 +1,5 @@ +--- +title: Upgrade brace-expansion NPM package due to security issue +merge_request: 13665 +author: Markus Koller +type: security diff --git a/package.json b/package.json index 1725658729a..99704c07849 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,7 @@ "babel-preset-latest": "^6.24.0", "babel-preset-stage-2": "^6.22.0", "bootstrap-sass": "^3.3.6", + "brace-expansion": "^1.1.8", "compression-webpack-plugin": "^1.0.0", "copy-webpack-plugin": "^4.0.1", "core-js": "^2.4.1", diff --git a/yarn.lock b/yarn.lock index 396737a64a7..5245666fa43 100644 --- a/yarn.lock +++ b/yarn.lock @@ -990,7 +990,7 @@ brace-expansion@^1.0.0: balanced-match "^0.4.1" concat-map "0.0.1" -brace-expansion@^1.1.7: +brace-expansion@^1.1.8: version "1.1.8" resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.8.tgz#c07b211c7c952ec1f8efd51a77ef0d1d3990a292" dependencies: |