diff options
author | José Valim <jose.valim@gmail.com> | 2011-12-22 09:20:18 -0800 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2011-12-22 09:20:18 -0800 |
commit | 6def76db7b92efc5e301503d542db0d62d3d8284 (patch) | |
tree | 3a48154787950194604b6da2714f8a32ec913b04 /activesupport/lib | |
parent | 91681c281b0693d376342e3cc1ebeb86449ef197 (diff) | |
parent | 9d97173c5a3f023e50f85503c120fbad9d0b26d2 (diff) | |
download | rails-6def76db7b92efc5e301503d542db0d62d3d8284.tar.gz rails-6def76db7b92efc5e301503d542db0d62d3d8284.tar.bz2 rails-6def76db7b92efc5e301503d542db0d62d3d8284.zip |
Merge pull request #4133 from lest/remove-1-8-code
no more need to make Time#to_date and Time#to_datetime public
Diffstat (limited to 'activesupport/lib')
4 files changed, 0 insertions, 13 deletions
diff --git a/activesupport/lib/active_support/core_ext/string/conversions.rb b/activesupport/lib/active_support/core_ext/string/conversions.rb index 73eedf5982..541f969faa 100644 --- 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 index 49ac18d245..5a17fc1afa 100644 --- 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 deleted file mode 100644 index e1878d3c20..0000000000 --- a/activesupport/lib/active_support/core_ext/time/publicize_conversion_methods.rb +++ /dev/null @@ -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 diff --git a/activesupport/lib/active_support/time.rb b/activesupport/lib/active_support/time.rb index 4ef289a414..9634b52ecf 100644 --- a/activesupport/lib/active_support/time.rb +++ b/activesupport/lib/active_support/time.rb @@ -13,7 +13,6 @@ end 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' |