Downgrade mysql2 so that it matched rails' dependency.

ari · Oct 29, 2015 · e2cede5 · e2cede5
1 parent feacf1d
commit e2cede5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Gemfile b/Gemfile
@@ -38,7 +38,8 @@ end
 platforms :mri do
   gem 'daemons'
 
-  gem 'mysql2',  group: :mysql
+  # https://github.com/rails/rails/blob/3-2-stable/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb#L3
+  gem 'mysql2', '~> 0.3.10', group: :mysql
   gem 'pg',      group: :postgres
   gem 'sqlite3', group: :sqlite
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -184,7 +184,6 @@ GEM
     minitest (5.8.1)
     multi_json (1.11.2)
     multi_test (0.1.2)
-    mysql2 (0.4.1)
     net-ldap (0.11)
     netrc (0.10.3)
     nokogiri (1.6.6.2)
@@ -355,7 +354,7 @@ DEPENDENCIES
   launchy
   localeapp
   machinist (= 1.0.6)
-  mysql2
+  mysql2 (~> 0.3.10)
   net-ldap
   paperclip (< 4)
   pg