diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2017-03-02 13:12:15 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-03-02 13:12:15 +0000 |
commit | e9d75a4b856513ce848c0a704cced54cff9f48f8 (patch) | |
tree | b0378fb684f685894c9a16b912d79134a2009559 | |
parent | 9039c625fe1e6b01b5ef3aacf2704d3ee5b6ef4a (diff) | |
parent | c691de49a87aedf029b58d6f3c1f8ee345af6eb9 (diff) | |
download | gitlab-ce-e9d75a4b856513ce848c0a704cced54cff9f48f8.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.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 0f210f57408..2d7e6f6f0bf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -664,7 +664,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) @@ -1014,4 +1014,4 @@ DEPENDENCIES wikicloth (= 0.8.1) BUNDLED WITH - 1.14.4 + 1.14.5 |