diff options
| -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 |