Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

Update roo

Browse source
This commit is contained in:
wvengen 2015-05-30 19:09:58 +02:00
parent 7f9c99f849
commit 491ca00949
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Gemfile
View file

@ -43,7 +43,8 @@ gem 'ruby-units'
gem 'attribute_normalizer' gem 'attribute_normalizer'
gem 'ice_cube', '~> 0.13.0' gem 'ice_cube', '~> 0.13.0'
gem 'recurring_select' gem 'recurring_select'
gem 'roo', '~> 1.13.2' gem 'roo', '~> 2.0.0'
gem 'roo-xls'
gem 'spreadsheet' gem 'spreadsheet'
# we use the git version of acts_as_versioned, and need to include it in this Gemfile # we use the git version of acts_as_versioned, and need to include it in this Gemfile

12
Gemfile.lock
View file

@ -330,10 +330,13 @@ GEM
http-cookie (>= 1.0.2, < 2.0) http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 3.0) mime-types (>= 1.16, < 3.0)
netrc (~> 0.7) netrc (~> 0.7)
roo (1.13.2) roo (2.0.0)
nokogiri (~> 1)
rubyzip (~> 1.1, < 2.0.0)
roo-xls (1.0.0)
nokogiri nokogiri
rubyzip roo (>= 2.0.0beta1, < 3)
spreadsheet (> 0.6.4) spreadsheet (> 0.9.0)
rspec (3.2.0) rspec (3.2.0)
rspec-core (~> 3.2.0) rspec-core (~> 3.2.0)
rspec-expectations (~> 3.2.0) rspec-expectations (~> 3.2.0)
@ -517,7 +520,8 @@ DEPENDENCIES
ransack ransack
recurring_select recurring_select
resque resque
roo (~> 1.13.2) roo (~> 2.0.0)
roo-xls
rspec-core (~> 3.2) rspec-core (~> 3.2)
rspec-legacy_formatters rspec-legacy_formatters
rspec-rails rspec-rails