Merge branch '1395-mysql2-ruby1.9-bug' of https://github.com/Flink/di…

…aspora
diaspora · Sep 14, 2011 · c6502a7 · c6502a7
2 parents d7a7154 + e25dd94
commit c6502a7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Gemfile b/Gemfile
@@ -33,7 +33,7 @@ gem 'settingslogic', '2.0.6'
 
 gem 'activerecord-import'
 gem 'foreigner', '0.9.1'
-gem 'mysql2', '0.2.6' if ENV['DB'].nil? || ENV['DB'] == 'all' || ENV['DB'] == 'mysql'
+gem 'mysql2', '0.2.13' if ENV['DB'].nil? || ENV['DB'] == 'all' || ENV['DB'] == 'mysql'
 gem 'pg' if ENV['DB'] == 'all' || ENV['DB'] == 'postgres'
 gem 'sqlite3' if ENV['DB'] == 'all' || ENV['DB'] == 'sqlite'
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -265,7 +265,7 @@ GEM
     multi_json (1.0.3)
     multi_xml (0.2.2)
     multipart-post (1.1.3)
-    mysql2 (0.2.6)
+    mysql2 (0.2.13)
     net-ldap (0.2.2)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
@@ -505,7 +505,7 @@ DEPENDENCIES
   mini_magick (= 3.2)
   mobile-fu
   mongrel
-  mysql2 (= 0.2.6)
+  mysql2 (= 0.2.13)
   newrelic_rpm
   nokogiri
   oauth2-provider (= 0.0.16)