Merge branch 'master' of git://github.com/rails/rails

1 files changed, 13 insertions, 5 deletions

diff --git a/Gemfile b/Gemfile
index e11514d5e6..508d083fe6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,10 +6,18 @@ if ENV['AREL']
   gem "arel", :path => ENV['AREL']
 end
 
+gem "bcrypt-ruby", "~> 3.0.0"
 gem "jquery-rails"
+
+if ENV['JOURNEY']
+  gem "journey", :path => ENV['JOURNEY']
+else
+  gem "journey", :git => "git://github.com/rails/journey"
+end
+
 # This needs to be with require false to avoid
 # it being automatically loaded by sprockets
-gem "uglifier", ">= 1.0.0", :require => false
+gem "uglifier", ">= 1.0.3", :require => false
 
 # Temp fix until rake 0.9.3 is out
 if RUBY_VERSION >= "1.9.3"
@@ -21,7 +29,7 @@ gem "mocha", ">= 0.9.8"
 
 group :doc do
   gem "rdoc",  "~> 3.4"
-  gem "horo",  "= 1.0.3"
+  gem "sdoc",  "~> 0.3"
   gem "RedCloth", "~> 4.2" if RUBY_VERSION < "1.9.3"
   gem "w3c_validators"
 end
@@ -67,7 +75,7 @@ end
 platforms :jruby do
   gem "ruby-debug", ">= 0.10.3"
   gem "json"
-  gem "activerecord-jdbcsqlite3-adapter"
+  gem "activerecord-jdbcsqlite3-adapter", ">= 1.2.0"
 
   # This is needed by now to let tests work on JRuby
   # TODO: When the JRuby guys merge jruby-openssl in
@@ -75,8 +83,8 @@ platforms :jruby do
   gem "jruby-openssl"
 
   group :db do
-    gem "activerecord-jdbcmysql-adapter"
-    gem "activerecord-jdbcpostgresql-adapter"
+    gem "activerecord-jdbcmysql-adapter", ">= 1.2.0"
+    gem "activerecord-jdbcpostgresql-adapter", ">= 1.2.0"
   end
 end