diff --git a/Gemfile b/Gemfile index e840578a..5763d58c 100644 --- a/Gemfile +++ b/Gemfile @@ -40,9 +40,9 @@ gem 'whenever', require: false # For defining cronjobs, see config/schedule.rb gem 'protected_attributes', '= 1.1.0' # 1.1.0 until tests work work with higher versions gem 'ruby-units' gem 'attribute_normalizer' -gem 'ice_cube', '~> 0.13.0' +gem 'ice_cube' gem 'recurring_select' -gem 'roo', '~> 2.0.0' +gem 'roo' gem 'roo-xls' gem 'spreadsheet' gem 'gaffe' diff --git a/Gemfile.lock b/Gemfile.lock index 79a14770..5f968a9c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -184,7 +184,7 @@ GEM i18n (~> 0.6, >= 0.6.6) i18n-spec (0.6.0) iso - ice_cube (0.13.3) + ice_cube (0.14.0) inherited_resources (1.6.0) actionpack (>= 3.2, < 5) has_scope (~> 0.6.0.rc) @@ -331,7 +331,7 @@ GEM redis-namespace (~> 1.3) sinatra (>= 0.9.2) vegas (~> 0.1.2) - roo (2.0.1) + roo (2.4.0) nokogiri (~> 1) rubyzip (~> 1.1, < 2.0.0) roo-xls (1.0.0) @@ -494,7 +494,7 @@ DEPENDENCIES haml-rails i18n-js (~> 3.0.0.rc8) i18n-spec - ice_cube (~> 0.13.0) + ice_cube inherited_resources jquery-rails kaminari @@ -517,7 +517,7 @@ DEPENDENCIES ransack recurring_select resque - roo (~> 2.0.0) + roo roo-xls rspec-core (~> 3.2) rspec-rails