diff options
| author | Kushal Pandya <kushalspandya@gmail.com> | 2019-06-24 09:54:37 +0000 |
|---|---|---|
| committer | Kushal Pandya <kushalspandya@gmail.com> | 2019-06-24 09:54:37 +0000 |
| commit | e64031af07adc5f484b52f22dc3a5b6cad581a5f (patch) | |
| tree | 3c0e0dc539d2588214421424d2ac7071b8951461 | |
| parent | 733f384ba8e9ecb2748bcd8c0cd91d8e370f8cc7 (diff) | |
| parent | 23e89f4bb09d3f7e0dd19152c0fe81f3e3939530 (diff) | |
| download | gitlab-ce-e64031af07adc5f484b52f22dc3a5b6cad581a5f.tar.gz | |
Merge branch 'update-tar-to-2.2.2' into 'master'
Update tar to 2.2.2
See merge request gitlab-org/gitlab-ce!29949
| -rw-r--r-- | changelogs/unreleased/update-tar-to-2-2-2.yml | 5 | ||||
| -rw-r--r-- | yarn.lock | 16 |
2 files changed, 13 insertions, 8 deletions
diff --git a/changelogs/unreleased/update-tar-to-2-2-2.yml b/changelogs/unreleased/update-tar-to-2-2-2.yml new file mode 100644 index 00000000000..f142fe59448 --- /dev/null +++ b/changelogs/unreleased/update-tar-to-2-2-2.yml @@ -0,0 +1,5 @@ +--- +title: Update tar to 2.2.2 +merge_request: 29949 +author: Takuya Noguchi +type: security diff --git a/yarn.lock b/yarn.lock index 5b725f07c93..7bbb8ef0f87 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4829,10 +4829,10 @@ fsevents@^1.2.2, fsevents@^1.2.7: nan "^2.12.1" node-pre-gyp "^0.12.0" -fstream@^1.0.0, fstream@^1.0.2: - version "1.0.11" - resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171" - integrity sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE= +fstream@^1.0.0, fstream@^1.0.12: + version "1.0.12" + resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045" + integrity sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg== dependencies: graceful-fs "^4.1.2" inherits "~2.0.0" @@ -10537,12 +10537,12 @@ tapable@^1.0.0, tapable@^1.1.0: integrity sha512-IlqtmLVaZA2qab8epUXbVWRn3aB1imbDMJtjB3nu4X0NqPkcY/JH9ZtCBWKHWPxs8Svi9tyo8w2dBoi07qZbBA== tar@^2.0.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1" - integrity sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE= + version "2.2.2" + resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.2.tgz#0ca8848562c7299b8b446ff6a4d60cdbb23edc40" + integrity sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA== dependencies: block-stream "*" - fstream "^1.0.2" + fstream "^1.0.12" inherits "2" tar@^4: |