Merge pull request #4133 from lest/remove-1-8-code

no more need to make Time#to_date and Time#to_datetime public
rails · Dec 22, 2011 · 6def76d · 6def76d
2 parents 91681c2 + 9d97173
commit 6def76d
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 13 deletions.
diff --git a/activesupport/lib/active_support/core_ext/string/conversions.rb b/activesupport/lib/active_support/core_ext/string/conversions.rb
@@ -1,5 +1,4 @@
 require 'date'
-require 'active_support/core_ext/time/publicize_conversion_methods'
 require 'active_support/core_ext/time/calculations'
 
 class String

diff --git a/activesupport/lib/active_support/core_ext/time/conversions.rb b/activesupport/lib/active_support/core_ext/time/conversions.rb
@@ -1,5 +1,4 @@
 require 'active_support/inflector/methods'
-require 'active_support/core_ext/time/publicize_conversion_methods'
 require 'active_support/values/time_zone'
 
 class Time

diff --git a/activesupport/lib/active_support/core_ext/time/publicize_conversion_methods.rb b/activesupport/lib/active_support/core_ext/time/publicize_conversion_methods.rb
diff --git a/activesupport/lib/active_support/time.rb b/activesupport/lib/active_support/time.rb
@@ -13,7 +13,6 @@ module ActiveSupport
 require 'date'
 require 'time'
 
-require 'active_support/core_ext/time/publicize_conversion_methods'
 require 'active_support/core_ext/time/marshal'
 require 'active_support/core_ext/time/acts_like'
 require 'active_support/core_ext/time/calculations'