aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/lib
diff options
context:
space:
mode:
authorAndrey Novikov <envek@envek.name>2015-06-13 14:01:27 +0300
committerAndrey Novikov <envek@envek.name>2016-01-05 18:35:04 +0300
commit0a0ffb64d88949db29c235637eeadeea3eeaf292 (patch)
tree7d753486fa306053100af4a370a706dc7e354e84 /activemodel/lib
parent3d90a6348d1541a2ecd00d959f9eec99ec78905a (diff)
downloadrails-0a0ffb64d88949db29c235637eeadeea3eeaf292.tar.gz
rails-0a0ffb64d88949db29c235637eeadeea3eeaf292.tar.bz2
rails-0a0ffb64d88949db29c235637eeadeea3eeaf292.zip
Take UTC offset into account when assigning string value to time attribute.
Diffstat (limited to 'activemodel/lib')
-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 fe09f63a87..34e09f0aba 100644
--- a/activemodel/lib/active_model/type/time.rb
+++ b/activemodel/lib/active_model/type/time.rb
@@ -38,7 +38,7 @@ module ActiveModel
fast_string_to_time(dummy_time_value) || begin
time_hash = ::Date._parse(dummy_time_value)
return if time_hash[:hour].nil?
- new_time(*time_hash.values_at(:year, :mon, :mday, :hour, :min, :sec, :sec_fraction))
+ new_time(*time_hash.values_at(:year, :mon, :mday, :hour, :min, :sec, :sec_fraction, :offset))
end
end
end