Merge branch '28933-update-rubyzip' into 'master'

Update Rubyzip to 1.2.1 Closes #28933 See merge request !9660

Merge branch '28933-update-rubyzip' into 'master'
bc1e2cc2 · Sean McGivern · Felipe Artur · 565a7379 · bc1e2cc2
Commit bc1e2cc2 authored Mar 02, 2017 by Sean McGivern Committed by Felipe Artur Mar 03, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Gemfile.lock Gemfile.lock +2 -2

No files found.
--- 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