diff options
| author | Joshua Peek <josh@joshpeek.com> | 2009-05-29 16:06:21 -0500 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2009-05-29 16:06:21 -0500 |
| commit | 69742ca8fa05509f7d7c5512cb6d8e002ecb3ab3 (patch) | |
| tree | 044c2131cc87d21ee54027511aae2b7f2d2ae26a /ci/geminstaller.yml | |
| parent | 5f3f100ce2d689480da85abc88e5e940cf90189e (diff) | |
| parent | 5ec2c7dc29b36d85b2658465b8a979deb0529d7e (diff) | |
| download | rails-69742ca8fa05509f7d7c5512cb6d8e002ecb3ab3.tar.gz rails-69742ca8fa05509f7d7c5512cb6d8e002ecb3ab3.tar.bz2 rails-69742ca8fa05509f7d7c5512cb6d8e002ecb3ab3.zip | |
Merge branch 'master' into active_model
Conflicts:
activemodel/lib/active_model/core.rb
activemodel/test/cases/state_machine/event_test.rb
activemodel/test/cases/state_machine/state_transition_test.rb
activerecord/lib/active_record/validations.rb
activerecord/test/cases/validations/i18n_validation_test.rb
activeresource/lib/active_resource.rb
activeresource/test/abstract_unit.rb
Diffstat (limited to 'ci/geminstaller.yml')
| -rw-r--r-- | ci/geminstaller.yml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ci/geminstaller.yml b/ci/geminstaller.yml index 33f1e81179..f1ef9b59a0 100644 --- a/ci/geminstaller.yml +++ b/ci/geminstaller.yml @@ -14,10 +14,12 @@ gems: - name: pg version: >= 0.7.9.2008.10.13 - name: rack - version: '~> 0.9.0' + version: '~> 1.0.0' - name: rake version: >= 0.8.1 - name: sqlite-ruby version: >= 2.2.3 - name: sqlite3-ruby version: >= 1.2.2 +- name: rubygems-update + version: >= 1.3.3 |