1 files changed, 13 insertions, 1 deletions
diff --git a/activemodel/lib/active_model/type/date.rb b/activemodel/lib/active_model/type/date.rb
index 8cecc16d0f..edc408f541 100644
--- a/activemodel/lib/active_model/type/date.rb
+++ b/activemodel/lib/active_model/type/date.rb
@@ -17,6 +17,18 @@ module ActiveModel
         value.to_s(:db).inspect
       end
 
+      def is_utc?
+        ::Time.zone_default.nil? || ::Time.zone_default =~ "UTC"
+      end
+
+      def default_timezone
+        if is_utc?
+          :utc
+        else
+          :local
+        end
+      end
+
       private
 
         def cast_value(value)
@@ -49,7 +61,7 @@ module ActiveModel
 
         def value_from_multiparameter_assignment(*)
           time = super
-          time && time.to_date
+          time && new_date(time.year, time.mon, time.mday)
         end
     end
   end