aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller.rb
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2007-04-30 01:17:56 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2007-04-30 01:17:56 +0000
commitda257eb81ba1eab76ef2c1a256916193858418d4 (patch)
tree3b472ae6730ce177c6a496da0ea2b15ab988942d /actionpack/lib/action_controller.rb
parent0dc70383097f1212fa7d9b21c57e31cfd4b7204c (diff)
downloadrails-da257eb81ba1eab76ef2c1a256916193858418d4.tar.gz
rails-da257eb81ba1eab76ef2c1a256916193858418d4.tar.bz2
rails-da257eb81ba1eab76ef2c1a256916193858418d4.zip
Added the first part of Simply Helpful to core. The rest is pending a clean integartion of polymorphic urls [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6633 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller.rb')
-rwxr-xr-xactionpack/lib/action_controller.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
index cabcae866b..a0bdf4995c 100755
--- a/actionpack/lib/action_controller.rb
+++ b/actionpack/lib/action_controller.rb
@@ -54,6 +54,7 @@ require 'action_controller/verification'
require 'action_controller/streaming'
require 'action_controller/session_management'
require 'action_controller/components'
+require 'action_controller/record_identifier'
require 'action_controller/macros/auto_complete'
require 'action_controller/macros/in_place_editing'
@@ -76,6 +77,7 @@ ActionController::Base.class_eval do
include ActionController::Streaming
include ActionController::SessionManagement
include ActionController::Components
+ include ActionController::RecordIdentifier
include ActionController::Macros::AutoComplete
include ActionController::Macros::InPlaceEditing
end