summaryrefslogtreecommitdiff
path: root/Gemfile.lock
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 /Gemfile.lock
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 'Gemfile.lock')
-rw-r--r--Gemfile.lock2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index b9fa9c74919..91cd360e708 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -801,7 +801,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)