diff --git a/Gemfile b/Gemfile index d829a2b448..bbff1d9b42 100644 --- a/Gemfile +++ b/Gemfile @@ -90,7 +90,7 @@ platforms :ruby do group :db do gem 'pg', '>= 0.18.0' gem 'mysql', '>= 2.9.0' - gem 'mysql2', '>= 0.4.0', github: 'brianmario/mysql2' + gem 'mysql2', '>= 0.4.0' end end diff --git a/Gemfile.lock b/Gemfile.lock index 0700980bca..44fedddc04 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -19,12 +19,6 @@ GIT qu (= 0.2.0) redis-namespace -GIT - remote: git://github.com/brianmario/mysql2.git - revision: 4d76557499b762d5a62aebb7f6a56510ad221eab - specs: - mysql2 (0.4.0) - GIT remote: git://github.com/mikel/mail.git revision: 64ef1a12efcdda53fd63e1456c2c564044bf82ce @@ -209,6 +203,7 @@ GEM multi_json (1.11.2) mustache (1.0.2) mysql (2.9.1) + mysql2 (0.4.0) nokogiri (1.6.6.2) mini_portile (~> 0.6.0) nokogiri (1.6.6.2-x64-mingw32) @@ -318,7 +313,7 @@ DEPENDENCIES minitest (< 5.3.4) mocha (~> 0.14) mysql (>= 2.9.0) - mysql2 (>= 0.4.0)! + mysql2 (>= 0.4.0) nokogiri (>= 1.4.5) pg (>= 0.18.0) psych (~> 2.0)