aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/base.rb
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2009-12-20 20:05:26 -0600
committerJoshua Peek <josh@joshpeek.com>2009-12-20 20:05:26 -0600
commit29c8a43056f40759a8c64cbcbd4e71d4283b233d (patch)
treee5797a3fbcd299c10ec788eb3bedd9801128a096 /actionpack/lib/action_controller/base.rb
parent0f8a5c7954bfc134f46eeb72c4cc8744825cbb5a (diff)
downloadrails-29c8a43056f40759a8c64cbcbd4e71d4283b233d.tar.gz
rails-29c8a43056f40759a8c64cbcbd4e71d4283b233d.tar.bz2
rails-29c8a43056f40759a8c64cbcbd4e71d4283b233d.zip
Rename RackConvenience => RackDelegation
Diffstat (limited to 'actionpack/lib/action_controller/base.rb')
-rw-r--r--actionpack/lib/action_controller/base.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index d24c01c983..6eda653cb2 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -13,7 +13,7 @@ module ActionController
include ActionController::RenderOptions::All
include ActionController::Layouts
include ActionController::ConditionalGet
- include ActionController::RackConvenience
+ include ActionController::RackDelegation
include ActionController::Benchmarking
include ActionController::Configuration