diff --git a/Gemfile b/Gemfile index 84c26883f..df36918ac 100644 --- a/Gemfile +++ b/Gemfile @@ -63,7 +63,7 @@ gem 'autoprefixer-rails', '4.0.2.1' ENV['DB'] ||= 'mysql' -gem 'mysql2', '0.3.17' if ENV['DB'] == 'all' || ENV['DB'] == 'mysql' +gem 'mysql2', '0.3.18' if ENV['DB'] == 'all' || ENV['DB'] == 'mysql' gem 'pg', '0.18.1' if ENV['DB'] == 'all' || ENV['DB'] == 'postgres' gem 'activerecord-import', '0.7.0' diff --git a/Gemfile.lock b/Gemfile.lock index 9b569a5e9..24e448adb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -387,7 +387,7 @@ GEM multi_test (0.1.1) multi_xml (0.5.5) multipart-post (2.0.0) - mysql2 (0.3.17) + mysql2 (0.3.18) nenv (0.2.0) nested_form (0.3.2) net-scp (1.2.1) @@ -725,7 +725,7 @@ DEPENDENCIES mini_magick (= 4.1.0) minitest mobile-fu (= 1.3.1) - mysql2 (= 0.3.17) + mysql2 (= 0.3.18) nokogiri (= 1.6.4.1) omniauth (= 1.2.2) omniauth-facebook (= 1.6.0)