diff options
Diffstat (limited to 'activesupport')
-rw-r--r-- | activesupport/CHANGELOG | 2 | ||||
-rw-r--r-- | activesupport/lib/active_support/core_ext/date_time.rb | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG index 09ea8159a7..7a5a2f5586 100644 --- a/activesupport/CHANGELOG +++ b/activesupport/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Give DateTime correct .to_s implementations, lets it play nice with ActiveRecord quoting. [gbuesing] + * Add File.atomic_write, allows you to write large files in an atomic manner, preventing users from seeing half written files. [Koz] * Allow users to provide custom formatters to Logger. [aeden] diff --git a/activesupport/lib/active_support/core_ext/date_time.rb b/activesupport/lib/active_support/core_ext/date_time.rb index dc5dceaea5..535d94abb7 100644 --- a/activesupport/lib/active_support/core_ext/date_time.rb +++ b/activesupport/lib/active_support/core_ext/date_time.rb @@ -1,4 +1,6 @@ require 'date' require "#{File.dirname(__FILE__)}/time/behavior" +require "#{File.dirname(__FILE__)}/date_time/conversions" DateTime.send(:include, ActiveSupport::CoreExtensions::Time::Behavior) +DateTime.send(:include, ActiveSupport::CoreExtensions::DateTime::Conversions)
\ No newline at end of file |