diff --git a/Gemfile b/Gemfile index a85f5fc8cc93ec199aa7d301311de796fd3edcc2..f72f602b52e2710dc326142ad7ec42e59f2e5994 100644 --- a/Gemfile +++ b/Gemfile @@ -59,7 +59,7 @@ gem 'sass-rails', '4.0.4' ENV['DB'] ||= 'mysql' -gem 'mysql2', '0.3.16' if ENV['DB'] == 'all' || ENV['DB'] == 'mysql' +gem 'mysql2', '0.3.17' if ENV['DB'] == 'all' || ENV['DB'] == 'mysql' gem 'pg', '0.17.1' if ENV['DB'] == 'all' || ENV['DB'] == 'postgres' gem 'activerecord-import', '0.6.0' diff --git a/Gemfile.lock b/Gemfile.lock index a962caf1807cd5f9c98eeb485aeac20efd8d7a47..fde0db63dcd6a594c4810f52fc21a7a1e204e955 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -310,7 +310,7 @@ GEM multi_test (0.1.1) multi_xml (0.5.5) multipart-post (2.0.0) - mysql2 (0.3.16) + mysql2 (0.3.17) nested_form (0.3.2) net-scp (1.2.1) net-ssh (>= 2.6.5) @@ -614,7 +614,7 @@ DEPENDENCIES messagebus_ruby_api (= 1.0.3) mini_magick (= 3.8.1) mobile-fu (= 1.3.1) - mysql2 (= 0.3.16) + mysql2 (= 0.3.17) nokogiri (= 1.6.4.1) omniauth (= 1.2.2) omniauth-facebook (= 1.6.0)