diff options
author | Kasper Timm Hansen <kaspth@gmail.com> | 2017-02-20 22:15:31 +0100 |
---|---|---|
committer | Kasper Timm Hansen <kaspth@gmail.com> | 2017-02-20 22:15:31 +0100 |
commit | 507c9970ab2d9e8296d605bc94843e2aa62aa5fd (patch) | |
tree | fbead4ba5f60bd6f1c319d0015990e5aae2a1e99 /activerecord | |
parent | e9abbb700acd8165a8994d8b2a700e507fb3b7ff (diff) | |
download | rails-507c9970ab2d9e8296d605bc94843e2aa62aa5fd.tar.gz rails-507c9970ab2d9e8296d605bc94843e2aa62aa5fd.tar.bz2 rails-507c9970ab2d9e8296d605bc94843e2aa62aa5fd.zip |
Revert "Merge pull request #27925 from robin850/hwia-removal"
Pointed out by @matthewd that the HWIA subclass changes the
AS scoped class and top-level HWIA hierarchies out from under
existing classes.
This reverts commit 71da39097b67114329be6d8db7fe6911124531af, reversing
changes made to 41c33bd4b2ec3f4a482e6030b6fda15091d81e4a.
Diffstat (limited to 'activerecord')
-rw-r--r-- | activerecord/lib/active_record/attribute_methods/dirty.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/attribute_methods/dirty.rb b/activerecord/lib/active_record/attribute_methods/dirty.rb index 6aa414ba6b..31c1e687dc 100644 --- a/activerecord/lib/active_record/attribute_methods/dirty.rb +++ b/activerecord/lib/active_record/attribute_methods/dirty.rb @@ -50,7 +50,7 @@ module ActiveRecord super.tap do @previous_mutation_tracker = nil clear_mutation_trackers - @changed_attributes = ActiveSupport::HashWithIndifferentAccess.new + @changed_attributes = HashWithIndifferentAccess.new end end @@ -70,13 +70,13 @@ module ActiveRecord def changes_applied @previous_mutation_tracker = mutation_tracker - @changed_attributes = ActiveSupport::HashWithIndifferentAccess.new + @changed_attributes = HashWithIndifferentAccess.new clear_mutation_trackers end def clear_changes_information @previous_mutation_tracker = nil - @changed_attributes = ActiveSupport::HashWithIndifferentAccess.new + @changed_attributes = HashWithIndifferentAccess.new forget_attribute_assignments clear_mutation_trackers end |