diff options
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/lib/tasks/framework.rake | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index e607c0a2fc..9a14aeaa00 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Include Active Resource in rails:freeze:edge rake task. [Thomas Fuchs] + * Include Active Resource instead of Action Web Service [DHH] You can add AWS back with this in config/environment.rb: config.load_paths += %W( #{RAILS_ROOT}/vendor/rails/actionwebservice/lib ) diff --git a/railties/lib/tasks/framework.rake b/railties/lib/tasks/framework.rake index e9316b6c10..ae4b42b34a 100644 --- a/railties/lib/tasks/framework.rake +++ b/railties/lib/tasks/framework.rake @@ -60,7 +60,7 @@ namespace :rails do touch "vendor/rails/REVISION_#{ENV['REVISION']}" end - for framework in %w( railties actionpack activerecord actionmailer activesupport actionwebservice ) + for framework in %w(railties actionpack activerecord actionmailer activesupport actionwebservice activeresource) system "svn export #{rails_svn}/#{framework} vendor/rails/#{framework}" + (ENV['REVISION'] ? " -r #{ENV['REVISION']}" : "") end end |