aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/lib/active_model
diff options
context:
space:
mode:
authorAndrew White <pixeltrix@users.noreply.github.com>2019-01-21 20:26:45 +0000
committerGitHub <noreply@github.com>2019-01-21 20:26:45 +0000
commit4f62e757caf608d30d46ee745f4f666fb8eba2a7 (patch)
treefe09316da3912e930f9cf512c5d8b35bc91a075a /activemodel/lib/active_model
parentfeb97dfabd027a73a41ca8bd2ab7c3196ab76d3d (diff)
parentccdedeb9d5e1b2b74f03baef65aa8198b456e3b0 (diff)
downloadrails-4f62e757caf608d30d46ee745f4f666fb8eba2a7.tar.gz
rails-4f62e757caf608d30d46ee745f4f666fb8eba2a7.tar.bz2
rails-4f62e757caf608d30d46ee745f4f666fb8eba2a7.zip
Merge pull request #34990 from rails/fix-time-multiparameter-casting
Fix year value when casting a multiparameter time hash
Diffstat (limited to 'activemodel/lib/active_model')
-rw-r--r--activemodel/lib/active_model/type/time.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activemodel/lib/active_model/type/time.rb b/activemodel/lib/active_model/type/time.rb
index b3056b1333..8fba01b86a 100644
--- a/activemodel/lib/active_model/type/time.rb
+++ b/activemodel/lib/active_model/type/time.rb
@@ -5,7 +5,7 @@ module ActiveModel
class Time < Value # :nodoc:
include Helpers::TimeValue
include Helpers::AcceptsMultiparameterTime.new(
- defaults: { 1 => 1970, 2 => 1, 3 => 1, 4 => 0, 5 => 0 }
+ defaults: { 1 => 2000, 2 => 1, 3 => 1, 4 => 0, 5 => 0 }
)
def type