diff options
author | wycats <wycats@gmail.com> | 2010-03-26 15:10:24 -0700 |
---|---|---|
committer | wycats <wycats@gmail.com> | 2010-03-26 15:10:24 -0700 |
commit | 197904341f2b2f21d69c653cede3aec124e86720 (patch) | |
tree | 83f1234e238016126860a929594db22e1862d783 /Gemfile | |
parent | 76d2c455c0607b4cd5f238cadef8f933a18567fb (diff) | |
parent | b3a0aed028835ce4551c4a76742744a40a71b0be (diff) | |
download | rails-197904341f2b2f21d69c653cede3aec124e86720.tar.gz rails-197904341f2b2f21d69c653cede3aec124e86720.tar.bz2 rails-197904341f2b2f21d69c653cede3aec124e86720.zip |
Merge branch 'master' into docrails
Diffstat (limited to 'Gemfile')
-rw-r--r-- | Gemfile | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -7,14 +7,17 @@ gem "rails", "3.0.0.beta1" gem "rake", ">= 0.8.7" gem "mocha", ">= 0.9.8" -if RUBY_VERSION < '1.9' - gem "ruby-debug", ">= 0.10.3" +group :mri do + if RUBY_VERSION < '1.9' + gem "system_timer" + gem "ruby-debug", ">= 0.10.3" + end end # AR gem "sqlite3-ruby", ">= 1.2.5", :require => 'sqlite3' -group :test do +group :db do gem "pg", ">= 0.9.0" gem "mysql", ">= 2.8.1" end |