Browse files

Merge branch 'master' into rails3.2

  • Loading branch information...
2 parents 26b177e + 99538ec commit a394bb7e07f34eab7e496b9947e12dc29fece178 @goncalossilva committed Mar 8, 2012
Showing with 8 additions and 1 deletion.
  1. +8 −1 Gemfile
View
9 Gemfile
@@ -5,7 +5,14 @@ gem "activerecord", "~>3.2"
# Development dependencies
gem "rake"
gem "activesupport", "~>3.2"
-gem "sqlite3"
+
+platforms :ruby do
+ gem "sqlite3"
+end
+
+platforms :jruby do
+ gem "activerecord-jdbcsqlite3-adapter"
+end
group :test do
gem "minitest"

0 comments on commit a394bb7

Please sign in to comment.