diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-09-08 15:38:51 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-09-08 15:38:51 -0300 |
| commit | 670281c6b2e9b9e8c51a140f2a5f66b251f1b84b (patch) | |
| tree | ab141872d72e010c8a0fe371d22a00914c97e1eb /actionpack/Rakefile | |
| parent | 39e4e76d15233bb1cb0b778d920f54efe86bb4f0 (diff) | |
| parent | 1a0f822037c408a392ffa7b6e1ecbe5951ab48db (diff) | |
| download | rails-670281c6b2e9b9e8c51a140f2a5f66b251f1b84b.tar.gz rails-670281c6b2e9b9e8c51a140f2a5f66b251f1b84b.tar.bz2 rails-670281c6b2e9b9e8c51a140f2a5f66b251f1b84b.zip | |
Merge commit 'rails/master'
Conflicts:
activerecord/lib/active_record/associations.rb
Diffstat (limited to 'actionpack/Rakefile')
| -rw-r--r-- | actionpack/Rakefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/Rakefile b/actionpack/Rakefile index 7b7a83d2fc..06f6905af0 100644 --- a/actionpack/Rakefile +++ b/actionpack/Rakefile @@ -116,6 +116,7 @@ spec = Gem::Specification.new do |s| s.requirements << 'none' s.add_dependency('activesupport', '= 3.0.pre' + PKG_BUILD) + s.add_dependency('activemodel', '= 3.0.pre' + PKG_BUILD) s.add_dependency('rack', '~> 1.0.0') s.add_dependency('rack-test', '~> 0.4.2') |