aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/core_ext/date_time.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2009-02-28 16:48:14 -0800
committerJeremy Kemper <jeremy@bitsweat.net>2009-03-21 04:35:15 -0700
commita4e3aac40a7545285e4d1ccd78adfc41ca3d5f83 (patch)
tree1cf432cdb6fb06c24faceee1a8554b75daaf5bc5 /activesupport/lib/active_support/core_ext/date_time.rb
parent6ed42ebdff05f9d28a60e91093d8f9afad03a958 (diff)
downloadrails-a4e3aac40a7545285e4d1ccd78adfc41ca3d5f83.tar.gz
rails-a4e3aac40a7545285e4d1ccd78adfc41ca3d5f83.tar.bz2
rails-a4e3aac40a7545285e4d1ccd78adfc41ca3d5f83.zip
* Introduce ActiveSupport.core_ext Integer, %w(conversions time etc)
* Convert some extension modules to simply reopening the class * Remove deprecated Float time extensions * Fold Base64 extension into ActiveSupport::Base64 since stdlib Base64 is gone
Diffstat (limited to 'activesupport/lib/active_support/core_ext/date_time.rb')
-rw-r--r--activesupport/lib/active_support/core_ext/date_time.rb7
1 files changed, 3 insertions, 4 deletions
diff --git a/activesupport/lib/active_support/core_ext/date_time.rb b/activesupport/lib/active_support/core_ext/date_time.rb
index 66a93eac43..fd979a267e 100644
--- a/activesupport/lib/active_support/core_ext/date_time.rb
+++ b/activesupport/lib/active_support/core_ext/date_time.rb
@@ -1,12 +1,11 @@
+require 'active_support/core_ext/util'
require 'date'
require 'active_support/core_ext/time/behavior'
require 'active_support/core_ext/time/zones'
-require 'active_support/core_ext/date_time/calculations'
-require 'active_support/core_ext/date_time/conversions'
class DateTime
include ActiveSupport::CoreExtensions::Time::Behavior
include ActiveSupport::CoreExtensions::Time::Zones
- include ActiveSupport::CoreExtensions::DateTime::Calculations
- include ActiveSupport::CoreExtensions::DateTime::Conversions
end
+
+ActiveSupport.core_ext DateTime, %w(calculations conversions)