diff --git a/Gemfile b/Gemfile index 004f96da71..9c51d8541e 100644 --- a/Gemfile +++ b/Gemfile @@ -8,6 +8,7 @@ gem 'rails', '~> 3.2.22' gem 'rails-i18n', '~> 3.0.0' gem 'rails_safe_tasks', '~> 1.0' +gem "activerecord-import" # Patched version. See http://rubysec.com/advisories/CVE-2015-5312/. gem 'nokogiri', '>= 1.6.7.1' diff --git a/Gemfile.lock b/Gemfile.lock index 734cd65998..027cd074e7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -160,6 +160,8 @@ GEM activesupport (= 3.2.22.5) arel (~> 3.0.2) tzinfo (~> 0.3.29) + activerecord-import (1.0.1) + activerecord (>= 3.2) activeresource (3.2.22.5) activemodel (= 3.2.22.5) activesupport (= 3.2.22.5) @@ -785,6 +787,7 @@ PLATFORMS DEPENDENCIES active_model_serializers (= 0.8.4) activemerchant (~> 1.78) + activerecord-import acts-as-taggable-on (~> 3.4) andand angular-rails-templates (~> 0.3.0)