From 30391e9ddba745d6bdc0b23f526ecf432dfe6adf Mon Sep 17 00:00:00 2001 From: Sean Griffin Date: Fri, 8 Jan 2016 17:42:31 -0700 Subject: Fix the broken build This is really strange, as it passes on Travis for 2.3, and it passes for me locally on 2.2. But on travis w/ 2.2, passing `Float::INFINITY` in is resulting in an infinite loop. This should resolve it. --- .../lib/active_record/attribute_methods/time_zone_conversion.rb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'activerecord/lib/active_record/attribute_methods') 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 d9b9271fb0..061628725d 100644 --- a/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb +++ b/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb @@ -31,6 +31,8 @@ module ActiveRecord if value.acts_like?(:time) value.in_time_zone + elsif value.is_a?(::Float) + value else map(value) { |v| convert_time_to_time_zone(v) } end -- cgit v1.2.3