diff options
| author | Andrew White <andrew.white@unboxed.co> | 2017-03-16 09:14:13 +0000 |
|---|---|---|
| committer | Andrew White <andrew.white@unboxed.co> | 2017-03-16 09:14:13 +0000 |
| commit | 505537082849d912e8e29819655b80a573e93c0c (patch) | |
| tree | 77e09fc8e076a47fe78498784fd12767a799a9e3 /activesupport/lib/active_support/time_with_zone.rb | |
| parent | ee33b9e93a5a06aa6c312466576b91ed210cf7c0 (diff) | |
| download | rails-505537082849d912e8e29819655b80a573e93c0c.tar.gz rails-505537082849d912e8e29819655b80a573e93c0c.tar.bz2 rails-505537082849d912e8e29819655b80a573e93c0c.zip | |
Move `to_time` to `DateTime` compatibility.rb file
We are overriding it in `Time` and `ActiveSupport::TimeWithZone` so
there's no point in having it in the `DateAndTime::Compatibility`
module. Also add some docs for the `to_time` implementations.
Diffstat (limited to 'activesupport/lib/active_support/time_with_zone.rb')
| -rw-r--r-- | activesupport/lib/active_support/time_with_zone.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/time_with_zone.rb b/activesupport/lib/active_support/time_with_zone.rb index 7603d7069d..b0dd6b7e8c 100644 --- a/activesupport/lib/active_support/time_with_zone.rb +++ b/activesupport/lib/active_support/time_with_zone.rb @@ -411,7 +411,9 @@ module ActiveSupport @to_datetime ||= utc.to_datetime.new_offset(Rational(utc_offset, 86_400)) end - # Returns an instance of <tt>Time</tt> + # Returns an instance of +Time+, either with the same UTC offset + # as +self+ or in the local system timezone depending on the setting + # of +ActiveSupport.to_time_preserves_timezone+. def to_time if preserve_timezone @to_time_with_instance_offset ||= getlocal(utc_offset) |