diff --git a/Gemfile b/Gemfile index 51880d3a5..c159ad2f2 100644 --- a/Gemfile +++ b/Gemfile @@ -57,7 +57,7 @@ gem 'settingslogic', :git => 'https://github.com/binarylogic/settingslogic.git' # database gem "activerecord-import", "~> 0.2.9" -gem 'foreigner', '~> 1.1.0' +gem 'foreigner', '~> 1.2.1' gem 'mysql2', '0.3.11' if ENV['DB'].nil? || ENV['DB'] == 'all' || ENV['DB'] == 'mysql' gem 'pg' if ENV['DB'] == 'all' || ENV['DB'] == 'postgres' gem 'sqlite3' if ENV['DB'] == 'all' || ENV['DB'] == 'sqlite' diff --git a/Gemfile.lock b/Gemfile.lock index 783f99fbe..2726d7d18 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -104,7 +104,7 @@ GEM bbenezech-nested_form (0.0.6) bcrypt-ruby (3.0.1) bootstrap-sass (2.0.3.1) - builder (3.0.0) + builder (3.0.1) capistrano (2.12.0) highline net-scp (>= 1.0.0) @@ -188,7 +188,7 @@ GEM net-ssh (>= 2.1.3) nokogiri (~> 1.5.0) ruby-hmac - foreigner (1.1.6) + foreigner (1.2.1) activerecord (>= 3.0.0) foreman (0.46.0) thor (>= 0.13.6) @@ -495,7 +495,7 @@ DEPENDENCIES fastercsv (= 1.5.5) fixture_builder (= 0.3.3) fog - foreigner (~> 1.1.0) + foreigner (~> 1.2.1) foreman (= 0.46) fuubar (>= 1.0) gon