diff options
author | Pratik Naik <pratiknaik@gmail.com> | 2010-03-12 16:00:01 +0000 |
---|---|---|
committer | Pratik Naik <pratiknaik@gmail.com> | 2010-03-12 16:00:01 +0000 |
commit | e68bfaf1fe1a7890a67af6f444281185f507cf9e (patch) | |
tree | 5e73caccdcdd65d0ac97f9eb92195928f30925f2 /Gemfile | |
parent | ef6462c73003b28c8e060a06120abb9cd67b6d52 (diff) | |
parent | 16846553b8866eab2aa3b128a2a23a221a25f7e3 (diff) | |
download | rails-e68bfaf1fe1a7890a67af6f444281185f507cf9e.tar.gz rails-e68bfaf1fe1a7890a67af6f444281185f507cf9e.tar.bz2 rails-e68bfaf1fe1a7890a67af6f444281185f507cf9e.zip |
Merge remote branch 'mainstream/master'
Conflicts:
activerecord/lib/active_record/base.rb
railties/lib/rails/configuration.rb
railties/lib/rails/log_subscriber.rb
Diffstat (limited to 'Gemfile')
-rw-r--r-- | Gemfile | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -1,6 +1,7 @@ path File.dirname(__FILE__) -source 'http://gemcutter.org' +source 'http://rubygems.org' +gem "arel", :git => "git://github.com/rails/arel.git" gem "rails", "3.0.0.beta1" gem "rake", ">= 0.8.7" @@ -14,7 +15,7 @@ end gem "sqlite3-ruby", ">= 1.2.5", :require => 'sqlite3' group :test do - gem "pg", ">= 0.8.0" + gem "pg", ">= 0.9.0" gem "mysql", ">= 2.8.1" end @@ -22,6 +23,10 @@ end gem "rack-test", "0.5.3", :require => 'rack/test' gem "RedCloth", ">= 4.2.2" +group :documentation do + gem 'rdoc', '2.1' +end + if ENV['CI'] gem "nokogiri", ">= 1.4.0" |