1 files changed, 4 insertions, 25 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 2c8e86fbb2..df1231ad47 100644
--- a/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb
+++ b/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb
@@ -39,7 +39,7 @@ module ActiveRecord
           end
 
           def set_time_zone_without_conversion(value)
-            ::Time.zone.local_to_utc(value).in_time_zone if value
+            ::Time.zone.local_to_utc(value).try(:in_time_zone) if value
           end
 
           def map_avoiding_infinite_recursion(value)
@@ -63,13 +63,14 @@ module ActiveRecord
         self.skip_time_zone_conversion_for_attributes = []
 
         class_attribute :time_zone_aware_types, instance_writer: false
-        self.time_zone_aware_types = [:datetime, :not_explicitly_configured]
+        self.time_zone_aware_types = [:datetime, :time]
       end
 
       module ClassMethods
         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,35 +81,13 @@ module ActiveRecord
                 TimeZoneConverter.new(type)
               end
             end
-            super
           end
 
           def create_time_zone_conversion_attribute?(name, cast_type)
             enabled_for_column = time_zone_aware_attributes &&
               !skip_time_zone_conversion_for_attributes.include?(name.to_sym)
-            result = enabled_for_column &&
-              time_zone_aware_types.include?(cast_type.type)
-
-            if enabled_for_column &&
-              !result &&
-              cast_type.type == :time &&
-              time_zone_aware_types.include?(:not_explicitly_configured)
-              ActiveSupport::Deprecation.warn(<<-MESSAGE.strip_heredoc)
-              Time columns will become time zone aware in Rails 5.1. This
-              still causes `String`s to be parsed as if they were in `Time.zone`,
-              and `Time`s to be converted to `Time.zone`.
-
-              To keep the old behavior, you must add the following to your initializer:
-
-                  config.active_record.time_zone_aware_types = [:datetime]
-
-              To silence this deprecation warning, add the following:
-
-                  config.active_record.time_zone_aware_types = [:datetime, :time]
-            MESSAGE
-            end
 
-            result
+            enabled_for_column && time_zone_aware_types.include?(cast_type.type)
           end
       end
     end