diff options
| author | Pablo Ifran <pabloifran@gmail.com> | 2012-10-22 09:42:42 -0200 |
|---|---|---|
| committer | Pablo Ifran <pabloifran@gmail.com> | 2012-10-22 09:42:42 -0200 |
| commit | e041a50f2917f82950f9e5666f966d8992afd45d (patch) | |
| tree | 9f4d2e3aa88f28dba9d7a1d24d46977e0642a1eb /activerecord/test/cases/reflection_test.rb | |
| parent | 3e6b2f5d38e0f31db3fb0fcd3bbab92666a0e3e2 (diff) | |
| parent | ae27acb342c575ce19d5ad78cb13ba23f826fab1 (diff) | |
| download | rails-e041a50f2917f82950f9e5666f966d8992afd45d.tar.gz rails-e041a50f2917f82950f9e5666f966d8992afd45d.tar.bz2 rails-e041a50f2917f82950f9e5666f966d8992afd45d.zip | |
Merge branch 'master' of https://github.com/lifo/docrails
Conflicts:
activerecord/lib/active_record/callbacks.rb
Diffstat (limited to 'activerecord/test/cases/reflection_test.rb')
| -rw-r--r-- | activerecord/test/cases/reflection_test.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/activerecord/test/cases/reflection_test.rb b/activerecord/test/cases/reflection_test.rb index 588da68ec1..a9d46f4fba 100644 --- a/activerecord/test/cases/reflection_test.rb +++ b/activerecord/test/cases/reflection_test.rb @@ -3,7 +3,6 @@ require 'models/topic' require 'models/customer' require 'models/company' require 'models/company_in_module' -require 'models/subscriber' require 'models/ship' require 'models/pirate' require 'models/price_estimate' |