diff options
| author | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-05-14 17:38:30 -0700 |
|---|---|---|
| committer | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-05-14 17:38:30 -0700 |
| commit | b6bac73b282c7e500c43810f2a937fc0047e5979 (patch) | |
| tree | b234951c42e4c682ef723320287383ac3fff0cf1 /actionpack/test/activerecord/polymorphic_routes_test.rb | |
| parent | da65320433088548bc4cff33758e5acd71fd137a (diff) | |
| parent | c286952050e8fe16b0f6d64ba0687b52cc8f2ae1 (diff) | |
| download | rails-b6bac73b282c7e500c43810f2a937fc0047e5979.tar.gz rails-b6bac73b282c7e500c43810f2a937fc0047e5979.tar.bz2 rails-b6bac73b282c7e500c43810f2a937fc0047e5979.zip | |
Merge commit 'origin/master'
Conflicts:
actionpack/lib/action_controller/abstract/base.rb
actionpack/lib/action_controller/routing.rb
Diffstat (limited to 'actionpack/test/activerecord/polymorphic_routes_test.rb')
| -rw-r--r-- | actionpack/test/activerecord/polymorphic_routes_test.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/test/activerecord/polymorphic_routes_test.rb b/actionpack/test/activerecord/polymorphic_routes_test.rb index 35139fbb7f..b9f5be2361 100644 --- a/actionpack/test/activerecord/polymorphic_routes_test.rb +++ b/actionpack/test/activerecord/polymorphic_routes_test.rb @@ -1,4 +1,5 @@ require 'active_record_unit' +require 'fixtures/project' class Task < ActiveRecord::Base set_table_name 'projects' |