aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorMarcel Molina <marcel@vernix.org>2006-04-29 20:20:22 +0000
committerMarcel Molina <marcel@vernix.org>2006-04-29 20:20:22 +0000
commit9f92dd39849c353b8a69401a93ba7b13f93d669f (patch)
tree115190ab4023a28f8dff3e54b42fa1c981bc7d14 /activesupport
parent995167ec2eced73f44d4f961349dbbee6b297210 (diff)
downloadrails-9f92dd39849c353b8a69401a93ba7b13f93d669f.tar.gz
rails-9f92dd39849c353b8a69401a93ba7b13f93d669f.tar.bz2
rails-9f92dd39849c353b8a69401a93ba7b13f93d669f.zip
Replace alias method chaining with Module#alias_method_chain. [Marcel Molina Jr.]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4312 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/CHANGELOG2
-rw-r--r--activesupport/lib/active_support/core_ext/time/calculations.rb3
2 files changed, 3 insertions, 2 deletions
diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG
index 7d20611df2..16052680da 100644
--- a/activesupport/CHANGELOG
+++ b/activesupport/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Replace alias method chaining with Module#alias_method_chain. [Marcel Molina Jr.]
+
* Strip out punctuation on predicates or bang methods being aliased with alias_method_chain since target?_without_feature is not a valid method name. Add tests for Module#alias_method_chain. [Marcel Molina Jr.]
* Replace Ruby's deprecated append_features in favor of included. [Marcel Molina Jr.]
diff --git a/activesupport/lib/active_support/core_ext/time/calculations.rb b/activesupport/lib/active_support/core_ext/time/calculations.rb
index 7c60d5bed5..8511a74d5c 100644
--- a/activesupport/lib/active_support/core_ext/time/calculations.rb
+++ b/activesupport/lib/active_support/core_ext/time/calculations.rb
@@ -3,8 +3,7 @@ module ActiveSupport #:nodoc:
module Time #:nodoc:
# Enables the use of time calculations within Time itself
module Calculations
- def self.append_features(base) #:nodoc:
- super
+ def self.included(base) #:nodoc:
base.extend(ClassMethods)
end