diff options
Diffstat (limited to 'activesupport/lib/active_support/core_ext/date/zones.rb')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/date/zones.rb | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/activesupport/lib/active_support/core_ext/date/zones.rb b/activesupport/lib/active_support/core_ext/date/zones.rb index c1b3934722..d109b430db 100644 --- a/activesupport/lib/active_support/core_ext/date/zones.rb +++ b/activesupport/lib/active_support/core_ext/date/zones.rb @@ -1,15 +1,6 @@ require 'date' -require 'active_support/core_ext/time/zones' +require 'active_support/core_ext/date_and_time/zones' class Date - # Converts Date to a TimeWithZone in the current zone if <tt>Time.zone</tt> or - # <tt>Time.zone_default</tt> is set, otherwise converts Date to a Time via - # Date#to_time. - def to_time_in_current_zone - if ::Time.zone - ::Time.zone.local(year, month, day) - else - to_time - end - end + include DateAndTime::Zones end |