aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2010-02-19 18:24:05 -0200
committerYehuda Katz <yehudakatz@YK.local>2010-02-19 13:36:34 -0800
commite4b910f6a37fa0eb02b0545e7320cfe4d7ff2c04 (patch)
tree7821b9f7f2ad2f2de868e96e8e431762f7c1a367 /activesupport
parenta0a01d0c98e7f04a5bfff450f6758c89ef897b96 (diff)
downloadrails-e4b910f6a37fa0eb02b0545e7320cfe4d7ff2c04.tar.gz
rails-e4b910f6a37fa0eb02b0545e7320cfe4d7ff2c04.tar.bz2
rails-e4b910f6a37fa0eb02b0545e7320cfe4d7ff2c04.zip
require publicize_conversion_method to ensure to_date and to_datetime became public before redefining them (avoid warnings)
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/active_support/core_ext/string/conversions.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/core_ext/string/conversions.rb b/activesupport/lib/active_support/core_ext/string/conversions.rb
index 331416b3a9..52946f9037 100644
--- a/activesupport/lib/active_support/core_ext/string/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/string/conversions.rb
@@ -1,4 +1,5 @@
require 'date'
+require 'active_support/core_ext/time/publicize_conversion_methods'
require 'active_support/core_ext/time/calculations'
class String