diff --git a/Gemfile b/Gemfile index ab8aed9a3..a5716e277 100644 --- a/Gemfile +++ b/Gemfile @@ -62,7 +62,7 @@ gem "autoprefixer-rails", "6.3.3.1" ENV["DB"] ||= "mysql" -gem "mysql2", "0.4.2" if ENV["DB"] == "all" || ENV["DB"] == "mysql" +gem "mysql2", "0.4.3" if ENV["DB"] == "all" || ENV["DB"] == "mysql" gem "pg", "0.18.4" if ENV["DB"] == "all" || ENV["DB"] == "postgres" gem "activerecord-import", "0.11.0" diff --git a/Gemfile.lock b/Gemfile.lock index a4e602b14..6f422d1ff 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -457,6 +457,7 @@ GEM multi_test (0.1.2) multi_xml (0.5.5) multipart-post (2.0.0) + mysql2 (0.4.3) naught (1.1.0) nenv (0.3.0) nested_form (0.3.2) @@ -498,7 +499,6 @@ GEM orm_adapter (0.5.0) parser (2.3.0.4) ast (~> 2.2) - pg (0.18.4) phantomjs (2.1.1.0) powerpack (0.1.1) pry (0.10.3) @@ -834,6 +834,7 @@ DEPENDENCIES mini_magick (= 4.4.0) minitest mobile-fu (= 1.3.1) + mysql2 (= 0.4.3) nokogiri (= 1.6.7.2) omniauth (= 1.3.1) omniauth-facebook (= 3.0.0) @@ -841,7 +842,6 @@ DEPENDENCIES omniauth-twitter (= 1.2.1) omniauth-wordpress (= 0.2.2) open_graph_reader (= 0.6.1) - pg (= 0.18.4) pry pry-byebug pry-debundle