summaryrefslogtreecommitdiff
path: root/qa
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2018-09-04 18:03:08 +0000
committerRobert Speicher <robert@gitlab.com>2018-09-04 18:03:08 +0000
commit265b49135436af9b8938c4b21b13462f0cfffdcb (patch)
treea1887ad8cb2fdf787caa7c85178a17bec1e052bf /qa
parent3e1466d99d7ef34c0b42a07e6db3329896374b41 (diff)
parent4df16d8d5a1849d89f683b22389ebb5a93823fa0 (diff)
downloadgitlab-ce-265b49135436af9b8938c4b21b13462f0cfffdcb.tar.gz
Merge branch '50930-update-rubyzip-to-1-2-2' into 'master'
Update rubyzip gem to 1.2.2 (CVE-2018-1000544) Closes #50930 See merge request gitlab-org/gitlab-ce!21460
Diffstat (limited to 'qa')
-rw-r--r--qa/Gemfile.lock4
1 files changed, 2 insertions, 2 deletions
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