diff options
| author | Hongli Lai (Phusion) <hongli@phusion.nl> | 2008-12-03 19:30:35 +0100 |
|---|---|---|
| committer | Hongli Lai (Phusion) <hongli@phusion.nl> | 2008-12-03 19:30:35 +0100 |
| commit | ccb96f2297e8783165cba764e9b5d51e1a15ff87 (patch) | |
| tree | 3229e6fdddc42054615514d843c555e341003033 /actionpack/test/controller/integration_upload_test.rb | |
| parent | fb2325e35855d62abd2c76ce03feaa3ca7992e4f (diff) | |
| parent | 761a633a9c0a45d76ef3ed10da97e3696c3ded79 (diff) | |
| download | rails-ccb96f2297e8783165cba764e9b5d51e1a15ff87.tar.gz rails-ccb96f2297e8783165cba764e9b5d51e1a15ff87.tar.bz2 rails-ccb96f2297e8783165cba764e9b5d51e1a15ff87.zip | |
Merge commit 'origin/master' into savepoints
Conflicts:
activerecord/lib/active_record/fixtures.rb
activerecord/test/cases/defaults_test.rb
Diffstat (limited to 'actionpack/test/controller/integration_upload_test.rb')
| -rw-r--r-- | actionpack/test/controller/integration_upload_test.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/actionpack/test/controller/integration_upload_test.rb b/actionpack/test/controller/integration_upload_test.rb index 4af9b7e697..b1dd6a6341 100644 --- a/actionpack/test/controller/integration_upload_test.rb +++ b/actionpack/test/controller/integration_upload_test.rb @@ -1,6 +1,4 @@ require 'abstract_unit' -require 'action_controller/integration' -require 'action_controller/routing' unless defined? ApplicationController class ApplicationController < ActionController::Base |