Use older version of mysql2

openlocal · Aug 3, 2012 · b358a8e · b358a8e
1 parent 1d7521a
commit b358a8e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/Gemfile b/Gemfile
@@ -3,7 +3,8 @@ source :rubygems
 gem 'rails', '3.0.16'
 
 gem "capistrano"
-gem "activerecord-mysql2-adapter"
+# Need to use older version of mysql2 because we're on Rails 3.0
+gem "mysql2", "~> 0.2.7"
 gem "haml"
 gem "geokit"
 gem "nokogiri"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -34,8 +34,6 @@ GEM
       activesupport (= 3.0.16)
       arel (~> 2.0.10)
       tzinfo (~> 0.3.23)
-    activerecord-mysql2-adapter (0.0.2)
-      mysql2
     activeresource (3.0.16)
       activemodel (= 3.0.16)
       activesupport (= 3.0.16)
@@ -125,7 +123,7 @@ GEM
     mime-types (1.19)
     multi_json (1.3.6)
     multi_xml (0.5.1)
-    mysql2 (0.3.11)
+    mysql2 (0.2.18)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
     net-sftp (2.0.5)
@@ -210,7 +208,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord-mysql2-adapter
   capistrano
   capybara
   compass-rails
@@ -230,6 +227,7 @@ DEPENDENCIES
   haml
   httparty
   memcached
+  mysql2 (~> 0.2.7)
   nokogiri
   rack-throttle
   rails (= 3.0.16)