diff options
| author | José Valim <jose.valim@gmail.com> | 2011-12-30 10:58:35 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-12-30 10:58:35 -0800 |
| commit | 50f1743286ee2623556f36a046ef7082801dc650 (patch) | |
| tree | f6892df124b320a43d00bea36805bb266653410f /activesupport | |
| parent | 5681f79f642c57397bf18d239a9aa1dbf71b0f24 (diff) | |
| parent | 7249f94e6c432dae011efa6fd0f11a0fcf377a52 (diff) | |
| download | rails-50f1743286ee2623556f36a046ef7082801dc650.tar.gz rails-50f1743286ee2623556f36a046ef7082801dc650.tar.bz2 rails-50f1743286ee2623556f36a046ef7082801dc650.zip | |
Merge pull request #4236 from castlerock/to_time_available_in_ruby19_DateTime
remove condition since to_time always available in ruby19 DateTime
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/date_time/conversions.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/core_ext/date_time/conversions.rb b/activesupport/lib/active_support/core_ext/date_time/conversions.rb index 851012e3bf..d7b3ad7d8d 100644 --- a/activesupport/lib/active_support/core_ext/date_time/conversions.rb +++ b/activesupport/lib/active_support/core_ext/date_time/conversions.rb @@ -6,7 +6,7 @@ require 'active_support/values/time_zone' class DateTime # Ruby 1.9 has DateTime#to_time which internally relies on Time. We define our own #to_time which allows # DateTimes outside the range of what can be created with Time. - remove_method :to_time if instance_methods.include?(:to_time) + remove_method :to_time # Convert to a formatted string. See Time::DATE_FORMATS for predefined formats. # |