diff --git a/Gemfile b/Gemfile index 349820af9..dcfb309d3 100644 --- a/Gemfile +++ b/Gemfile @@ -36,7 +36,7 @@ gem 'rack-cors', '0.2.8', :require => 'rack/cors' ENV['DB'] ||= 'mysql' -gem 'mysql2', '0.3.13' if ENV['DB'] == 'all' || ENV['DB'] == 'mysql' +gem 'mysql2', '0.3.14' if ENV['DB'] == 'all' || ENV['DB'] == 'mysql' gem 'pg', '0.16.0' if ENV['DB'] == 'all' || ENV['DB'] == 'postgres' gem 'activerecord-import', '0.3.1' diff --git a/Gemfile.lock b/Gemfile.lock index 9ec1b3932..852681a5c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -222,7 +222,7 @@ GEM multi_json (1.7.9) multi_test (0.0.2) multipart-post (1.2.0) - mysql2 (0.3.13) + mysql2 (0.3.14) nested_form (0.3.2) net-scp (1.1.2) net-ssh (>= 2.6.5) @@ -467,7 +467,7 @@ DEPENDENCIES messagebus_ruby_api (= 1.0.3) mini_magick (= 3.6.0) mobile-fu (= 1.2.1) - mysql2 (= 0.3.13) + mysql2 (= 0.3.14) nokogiri (= 1.6.0) omniauth (= 1.1.4) omniauth-facebook (= 1.4.1)