Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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

no more need to make Time#to_date and Time#to_datetime public
  • Loading branch information...
commit 6def76db7b92efc5e301503d542db0d62d3d8284 2 parents 91681c2 + 9d97173
@josevalim josevalim authored
View
1  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
View
1  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
View
10 activesupport/lib/active_support/core_ext/time/publicize_conversion_methods.rb
@@ -1,10 +0,0 @@
-require 'date'
-
-class Time
- # Ruby 1.8-cvs and early 1.9 series define private Time#to_date
- %w(to_date to_datetime).each do |method|
- if private_instance_methods.include?(method) || private_instance_methods.include?(method.to_sym)
- public method
- end
- end
-end
View
1  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'
Please sign in to comment.
Something went wrong with that request. Please try again.