aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/core_ext/date
diff options
context:
space:
mode:
authorJosh Kalderimis <josh.kalderimis@gmail.com>2011-01-12 15:16:55 +0100
committerSantiago Pastorino <santiago@wyeworks.com>2011-01-12 12:37:01 -0200
commitde18b85969b7a5457536df905c76078f032a9cda (patch)
treedbfdd75d86562064b6fb422e54ddd2ac052cb533 /activesupport/lib/active_support/core_ext/date
parentde5852f1a694f912544a40c98812c5d2bcfbc5a6 (diff)
downloadrails-de18b85969b7a5457536df905c76078f032a9cda.tar.gz
rails-de18b85969b7a5457536df905c76078f032a9cda.tar.bz2
rails-de18b85969b7a5457536df905c76078f032a9cda.zip
In AS, only inflector/methods is need in proxy_wrappers.rb, as well as date, date_time, and time conversions.rb. This fixes an issue when requiring json and AS saying that i18n is also required.
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
Diffstat (limited to 'activesupport/lib/active_support/core_ext/date')
-rw-r--r--activesupport/lib/active_support/core_ext/date/conversions.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/core_ext/date/conversions.rb b/activesupport/lib/active_support/core_ext/date/conversions.rb
index 092f936961..06d868a3b0 100644
--- a/activesupport/lib/active_support/core_ext/date/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/date/conversions.rb
@@ -1,5 +1,5 @@
require 'date'
-require 'active_support/inflector'
+require 'active_support/inflector/methods'
require 'active_support/core_ext/date/zones'
class Date