aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2012-07-14 05:54:51 -0700
committerXavier Noria <fxn@hashref.com>2012-07-14 05:54:51 -0700
commit9b7401b23d7f82781084086bac903849294e7c7f (patch)
treeede4201274b69e06ebd1ec5839621684118e6d00
parentd08fee3f284e6cc2a6d825603b74daf8ab0ba09f (diff)
parent4940dc2c50642d0bea39b7b8786aa8c0882e4d04 (diff)
downloadrails-9b7401b23d7f82781084086bac903849294e7c7f.tar.gz
rails-9b7401b23d7f82781084086bac903849294e7c7f.tar.bz2
rails-9b7401b23d7f82781084086bac903849294e7c7f.zip
Merge pull request #7053 from pferdefleisch/activesupport-timely-requires
Added time related req files to AS core_ext #6896
-rw-r--r--activesupport/lib/active_support/core_ext/date.rb5
-rw-r--r--activesupport/lib/active_support/core_ext/date_time.rb4
-rw-r--r--activesupport/lib/active_support/core_ext/time.rb5
3 files changed, 14 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/core_ext/date.rb b/activesupport/lib/active_support/core_ext/date.rb
new file mode 100644
index 0000000000..465fedda80
--- /dev/null
+++ b/activesupport/lib/active_support/core_ext/date.rb
@@ -0,0 +1,5 @@
+require 'active_support/core_ext/date/acts_like'
+require 'active_support/core_ext/date/calculations'
+require 'active_support/core_ext/date/conversions'
+require 'active_support/core_ext/date/zones'
+
diff --git a/activesupport/lib/active_support/core_ext/date_time.rb b/activesupport/lib/active_support/core_ext/date_time.rb
new file mode 100644
index 0000000000..e8a27b9f38
--- /dev/null
+++ b/activesupport/lib/active_support/core_ext/date_time.rb
@@ -0,0 +1,4 @@
+require 'active_support/core_ext/date_time/acts_like'
+require 'active_support/core_ext/date_time/calculations'
+require 'active_support/core_ext/date_time/conversions'
+require 'active_support/core_ext/date_time/zones'
diff --git a/activesupport/lib/active_support/core_ext/time.rb b/activesupport/lib/active_support/core_ext/time.rb
new file mode 100644
index 0000000000..32cffe237d
--- /dev/null
+++ b/activesupport/lib/active_support/core_ext/time.rb
@@ -0,0 +1,5 @@
+require 'active_support/core_ext/time/acts_like'
+require 'active_support/core_ext/time/calculations'
+require 'active_support/core_ext/time/conversions'
+require 'active_support/core_ext/time/marshal'
+require 'active_support/core_ext/time/zones'