aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorGeoff Buesing <gbuesing@gmail.com>2008-01-23 16:10:28 +0000
committerGeoff Buesing <gbuesing@gmail.com>2008-01-23 16:10:28 +0000
commit2d0d348fb2d24fbf56fb901951ecda494c2cc6c4 (patch)
treeb83a2355ab67fc3f8157b04a30b62d81592fd323 /activesupport
parent2cd8424aaeb4b4757d532783be8ef0da1e778f88 (diff)
downloadrails-2d0d348fb2d24fbf56fb901951ecda494c2cc6c4.tar.gz
rails-2d0d348fb2d24fbf56fb901951ecda494c2cc6c4.tar.bz2
rails-2d0d348fb2d24fbf56fb901951ecda494c2cc6c4.zip
Remove unneeded #to_datetime_default_s alias for DateTime#to_s, given that we inherit a #to_default_s from Date that does exactly the same thing
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8705 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/CHANGELOG2
-rw-r--r--activesupport/lib/active_support/core_ext/date_time/conversions.rb1
2 files changed, 2 insertions, 1 deletions
diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG
index 17cc494e6e..8e74df3097 100644
--- a/activesupport/CHANGELOG
+++ b/activesupport/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Remove unneeded #to_datetime_default_s alias for DateTime#to_s, given that we inherit a #to_default_s from Date that does exactly the same thing [Geoff Buesing]
+
* Refactor Time and DateTime #to_formatted_s: use ternary instead of nested if/else [Geoff Buesing]
* Adding Time and DateTime #formatted_offset, for outputting +HH:MM utc offset strings with cross-platform consistency [Geoff Buesing]
diff --git a/activesupport/lib/active_support/core_ext/date_time/conversions.rb b/activesupport/lib/active_support/core_ext/date_time/conversions.rb
index fa49c70c90..7e78550f7c 100644
--- a/activesupport/lib/active_support/core_ext/date_time/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/date_time/conversions.rb
@@ -5,7 +5,6 @@ module ActiveSupport #:nodoc:
module Conversions
def self.included(base) #:nodoc:
base.class_eval do
- alias_method :to_datetime_default_s, :to_s
alias_method :to_s, :to_formatted_s
alias_method :default_inspect, :inspect
alias_method :inspect, :readable_inspect