diff options
author | Takuya Noguchi <takninnovationresearch@gmail.com> | 2018-09-02 02:05:40 +0900 |
---|---|---|
committer | Takuya Noguchi <takninnovationresearch@gmail.com> | 2018-09-03 15:32:57 +0900 |
commit | 4df16d8d5a1849d89f683b22389ebb5a93823fa0 (patch) | |
tree | 5a821790d6823d027af9db0af8e6e4d73653a88f | |
parent | ba99dfcde262c91e33b5bf7f86ba7c0e3b6f7e52 (diff) | |
download | gitlab-ce-4df16d8d5a1849d89f683b22389ebb5a93823fa0.tar.gz |
Update rubyzip to 1.2.2 (CVE-2018-1000544)
-rw-r--r-- | Gemfile.lock | 2 | ||||
-rw-r--r-- | Gemfile.rails5.lock | 2 | ||||
-rw-r--r-- | changelogs/unreleased/50930-update-rubyzip-to-1-2-2.yml | 5 | ||||
-rw-r--r-- | qa/Gemfile.lock | 4 |
4 files changed, 9 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 11921a64900..f253375265a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -804,7 +804,7 @@ GEM sexp_processor (~> 4.1) rubyntlm (0.6.2) rubypants (0.2.0) - rubyzip (1.2.1) + rubyzip (1.2.2) rufus-scheduler (3.4.0) et-orbi (~> 1.0) rugged (0.27.4) diff --git a/Gemfile.rails5.lock b/Gemfile.rails5.lock index 02f9e112300..17d3c1d415a 100644 --- a/Gemfile.rails5.lock +++ b/Gemfile.rails5.lock @@ -813,7 +813,7 @@ GEM sexp_processor (~> 4.1) rubyntlm (0.6.2) rubypants (0.2.0) - rubyzip (1.2.1) + rubyzip (1.2.2) rufus-scheduler (3.4.0) et-orbi (~> 1.0) rugged (0.27.4) diff --git a/changelogs/unreleased/50930-update-rubyzip-to-1-2-2.yml b/changelogs/unreleased/50930-update-rubyzip-to-1-2-2.yml new file mode 100644 index 00000000000..be5cc60df64 --- /dev/null +++ b/changelogs/unreleased/50930-update-rubyzip-to-1-2-2.yml @@ -0,0 +1,5 @@ +--- +title: Update rubyzip to 1.2.2 (CVE-2018-1000544) +merge_request: 21460 +author: Takuya Noguchi +type: security diff --git a/qa/Gemfile.lock b/qa/Gemfile.lock index 1bc424335f8..8f523e55adc 100644 --- a/qa/Gemfile.lock +++ b/qa/Gemfile.lock @@ -77,7 +77,7 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.7.0) rspec-support (3.7.0) - rubyzip (1.2.1) + rubyzip (1.2.2) selenium-webdriver (3.8.0) childprocess (~> 0.5) rubyzip (~> 1.0) @@ -103,4 +103,4 @@ DEPENDENCIES selenium-webdriver (~> 3.8.0) BUNDLED WITH - 1.16.1 + 1.16.4 |