diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-11-11 14:07:25 -0200 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-11-11 14:07:25 -0200 |
| commit | d99f96452277f53a6434bc81f7a9539daecba5a9 (patch) | |
| tree | 35ff0f6f4bd263756ef43197aa1a06324116c8ee /activesupport | |
| parent | e80e16b4ff68a5294f832d3666233f7312e1e3a1 (diff) | |
| parent | f0d0c0fa1b12276c961ac66a0f3a34ddb3786a69 (diff) | |
| download | rails-d99f96452277f53a6434bc81f7a9539daecba5a9.tar.gz rails-d99f96452277f53a6434bc81f7a9539daecba5a9.tar.bz2 rails-d99f96452277f53a6434bc81f7a9539daecba5a9.zip | |
Merge pull request #17047 from betesh/master
Time includes DateAndTime::Zones acts_like(:time)
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/time/zones.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/core_ext/time/zones.rb b/activesupport/lib/active_support/core_ext/time/zones.rb index bbda04d60c..64c3b7201b 100644 --- a/activesupport/lib/active_support/core_ext/time/zones.rb +++ b/activesupport/lib/active_support/core_ext/time/zones.rb @@ -1,4 +1,5 @@ require 'active_support/time_with_zone' +require 'active_support/core_ext/time/acts_like' require 'active_support/core_ext/date_and_time/zones' class Time |