aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/rescue.rb
diff options
context:
space:
mode:
authorMarcel Molina <marcel@vernix.org>2006-04-29 18:10:14 +0000
committerMarcel Molina <marcel@vernix.org>2006-04-29 18:10:14 +0000
commit61864909628f5ac2f20d3337e0274dab016ac7c5 (patch)
tree86a8cc11110b1009f23fe0c72a6138f8ac45d31a /actionpack/lib/action_controller/rescue.rb
parentdf26041c8990d4a0276e7a4c77cc771ac38e176e (diff)
downloadrails-61864909628f5ac2f20d3337e0274dab016ac7c5.tar.gz
rails-61864909628f5ac2f20d3337e0274dab016ac7c5.tar.bz2
rails-61864909628f5ac2f20d3337e0274dab016ac7c5.zip
Replace Ruby's deprecated append_features in favor of included. [Marcel Molina Jr.]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4310 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/rescue.rb')
-rw-r--r--actionpack/lib/action_controller/rescue.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/rescue.rb b/actionpack/lib/action_controller/rescue.rb
index d97a294964..9f0cd47092 100644
--- a/actionpack/lib/action_controller/rescue.rb
+++ b/actionpack/lib/action_controller/rescue.rb
@@ -6,8 +6,7 @@ module ActionController #:nodoc:
#
# You can tailor the rescuing behavior and appearance by overwriting the following two stub methods.
module Rescue
- def self.append_features(base) #:nodoc:
- super
+ def self.included(base) #:nodoc:
base.extend(ClassMethods)
base.class_eval do
alias_method :perform_action_without_rescue, :perform_action