diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2011-05-25 13:48:35 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-05-25 13:48:35 -0700 |
| commit | 6b436c23a90cb3bb2e2d55902a55fc6f659b90be (patch) | |
| tree | 0a9c74c9c7b7be0a1c216e7e0ecc121d6da42f06 /activerecord/lib/active_record/fixtures.rb | |
| parent | d25b7c2eeefff3a0abf7b532c10ce25a71d0fba2 (diff) | |
| parent | 542114e1d82fffa1062ef0eaa1053959ab9d14ec (diff) | |
| download | rails-6b436c23a90cb3bb2e2d55902a55fc6f659b90be.tar.gz rails-6b436c23a90cb3bb2e2d55902a55fc6f659b90be.tar.bz2 rails-6b436c23a90cb3bb2e2d55902a55fc6f659b90be.zip | |
Merge pull request #1285 from joshk/remove_active_record_deprecations
removed deprecated methods, and related tests, from ActiveRecord
Diffstat (limited to 'activerecord/lib/active_record/fixtures.rb')
| -rw-r--r-- | activerecord/lib/active_record/fixtures.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb index 1f31722a7c..50b2852659 100644 --- a/activerecord/lib/active_record/fixtures.rb +++ b/activerecord/lib/active_record/fixtures.rb @@ -12,7 +12,6 @@ require 'active_support/core_ext/array/wrap' require 'active_support/core_ext/object/blank' require 'active_support/core_ext/logger' require 'active_support/ordered_hash' -require 'active_support/core_ext/module/deprecation' require 'active_record/fixtures/file' if defined? ActiveRecord @@ -393,9 +392,6 @@ class FixturesFileNotFound < StandardError; end # # Any fixture labeled "DEFAULTS" is safely ignored. -Fixture = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('Fixture', 'ActiveRecord::Fixture') -Fixtures = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('Fixtures', 'ActiveRecord::Fixtures') - module ActiveRecord class Fixtures MAX_ID = 2 ** 30 - 1 |