diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2007-05-27 22:21:20 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2007-05-27 22:21:20 +0000 |
| commit | 2aed78d27016d3172e89f234e2d5a6552b3a493c (patch) | |
| tree | b9e79c9aaaf61a26dca67b14b3eb8e4be51a1f39 /railties | |
| parent | 3c356aa9ffca7d087a7d8a88f08df1e518816475 (diff) | |
| download | rails-2aed78d27016d3172e89f234e2d5a6552b3a493c.tar.gz rails-2aed78d27016d3172e89f234e2d5a6552b3a493c.tar.bz2 rails-2aed78d27016d3172e89f234e2d5a6552b3a493c.zip | |
Add Active Resource to rails:freeze:edge and drop Action Web Service. Closes #8205.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6872 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/lib/tasks/framework.rake | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 052eccba79..7f906d55af 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Drop Action Web Service from rails:freeze:edge. [Jeremy Kemper] + * Add db:create, drop, reset, charset, and collation tasks. #8448 [matt] * Scaffold generator depends on model generator instead of duplicating it. #7222 [bscofield] diff --git a/railties/lib/tasks/framework.rake b/railties/lib/tasks/framework.rake index ae4b42b34a..6eaff2918e 100644 --- a/railties/lib/tasks/framework.rake +++ b/railties/lib/tasks/framework.rake @@ -59,8 +59,8 @@ namespace :rails do touch "vendor/rails/REVISION_#{ENV['REVISION']}" end - - for framework in %w(railties actionpack activerecord actionmailer activesupport actionwebservice activeresource) + + for framework in %w(railties actionpack activerecord actionmailer activesupport activeresource) system "svn export #{rails_svn}/#{framework} vendor/rails/#{framework}" + (ENV['REVISION'] ? " -r #{ENV['REVISION']}" : "") end end |