aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlban Peignier2017-05-03 10:02:04 +0200
committerAlban Peignier2017-05-03 10:02:04 +0200
commit24fc29e3712fbfbfaaf5dba5924fa63fccdc4878 (patch)
tree368b2220b3f97ac4df5b6f7ac4bc93310721f95e
parentbc45e4ccd5dc999efb2c49a91750e3493d07407a (diff)
downloadchouette-core-24fc29e3712fbfbfaaf5dba5924fa63fccdc4878.tar.bz2
Update rubyzip to 1.2.1. Fixes #3274
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
2 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index 4e0dd5426..202e05198 100644
--- a/Gemfile
+++ b/Gemfile
@@ -95,7 +95,7 @@ gem 'breadcrumbs_on_rails'
# Format Output
gem 'json'
-gem 'rubyzip', '~> 1.1.7'
+gem 'rubyzip'
gem 'roo'
# Controller
diff --git a/Gemfile.lock b/Gemfile.lock
index 3acf91cc5..d220788ab 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -445,7 +445,7 @@ GEM
ruby-graphviz (1.2.3)
rubycas-client (2.3.9)
activesupport
- rubyzip (1.1.7)
+ rubyzip (1.2.1)
safe_yaml (1.0.4)
sass (3.2.19)
sass-rails (4.0.5)
@@ -641,7 +641,7 @@ DEPENDENCIES
rgeo (~> 0.5.2)
roo
rspec-rails (~> 3.5.0)
- rubyzip (~> 1.1.7)
+ rubyzip
sass-rails (~> 4.0.3)
sawyer (~> 0.6.0)
sdoc (~> 0.4.0)