summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-03-02 13:12:15 +0000
committerFelipe Artur <felipefac@gmail.com>2017-03-03 18:23:42 -0300
commitbc1e2cc21dba3d216f7375b4fccc9e805dae713f (patch)
treed737d36a717c6ff5bc9e7a2d15598d9af6f37bcd
parent565a73791d422321fc263d3dce4ea72c814af11f (diff)
downloadgitlab-ce-bc1e2cc21dba3d216f7375b4fccc9e805dae713f.tar.gz
Merge branch '28933-update-rubyzip' into 'master'
Update Rubyzip to 1.2.1 Closes #28933 See merge request !9660
-rw-r--r--Gemfile.lock4
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index c5dd6ab8d22..88c87682313 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -661,7 +661,7 @@ GEM
sexp_processor (~> 4.1)
rubyntlm (0.5.2)
rubypants (0.2.0)
- rubyzip (1.2.0)
+ rubyzip (1.2.1)
rufus-scheduler (3.1.10)
rugged (0.24.0)
safe_yaml (1.0.4)
@@ -1011,4 +1011,4 @@ DEPENDENCIES
wikicloth (= 0.8.1)
BUNDLED WITH
- 1.14.2
+ 1.14.5