diff options
author | Sean Griffin <sean@seantheprogrammer.com> | 2016-10-27 18:47:24 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-27 18:47:24 +0100 |
commit | 928f46621c115c41802d9bbafa29df46c85ae68f (patch) | |
tree | 76094bec092e420265552a8b47eb330b9c23db0e /activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb | |
parent | 7506f3390683fd1329e60385515c3c55b39ff1d5 (diff) | |
parent | 02063a8e63edf90a5ddca68e14a88191478c2a60 (diff) | |
download | rails-928f46621c115c41802d9bbafa29df46c85ae68f.tar.gz rails-928f46621c115c41802d9bbafa29df46c85ae68f.tar.bz2 rails-928f46621c115c41802d9bbafa29df46c85ae68f.zip |
Merge pull request #26915 from jules2689/time-zone-conversion-inherited-bug
Fixes an issue where time_zone_conversion that causes an exception in…
Diffstat (limited to 'activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb')
-rw-r--r-- | activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb b/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb index bea1514cdf..ce9985e2e1 100644 --- a/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb +++ b/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb @@ -70,6 +70,7 @@ module ActiveRecord private def inherited(subclass) + super # We need to apply this decorator here, rather than on module inclusion. The closure # created by the matcher would otherwise evaluate for `ActiveRecord::Base`, not the # sub class being decorated. As such, changes to `time_zone_aware_attributes`, or @@ -80,7 +81,6 @@ module ActiveRecord TimeZoneConverter.new(type) end end - super end def create_time_zone_conversion_attribute?(name, cast_type) |