diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-02-24 13:27:32 -0800 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-02-24 13:27:32 -0800 |
| commit | a06623609ee37f24b1b741098db52612b6f539ab (patch) | |
| tree | a2252bd0e280b9ca750b3907bd3d2aa0f2153729 /activesupport/lib | |
| parent | 70ec7e02458108805784786d2562b43b4c380342 (diff) | |
| parent | cb100ca02bf0652e39a61e7687a6ac034b1a9c43 (diff) | |
| download | rails-a06623609ee37f24b1b741098db52612b6f539ab.tar.gz rails-a06623609ee37f24b1b741098db52612b6f539ab.tar.bz2 rails-a06623609ee37f24b1b741098db52612b6f539ab.zip | |
Merge pull request #9403 from stopdropandrew/TimeWithZone#to_r
Added `ActiveSupport::TimeWithZone#to_r` for `Time#at` compatibility.
Closes #9404
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support/time_with_zone.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/time_with_zone.rb b/activesupport/lib/active_support/time_with_zone.rb index 0e6d12a186..98c866ac43 100644 --- a/activesupport/lib/active_support/time_with_zone.rb +++ b/activesupport/lib/active_support/time_with_zone.rb @@ -317,6 +317,10 @@ module ActiveSupport end alias_method :tv_sec, :to_i + def to_r + utc.to_r + end + # Return an instance of Time in the system timezone. def to_time utc.to_time |