diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-05-13 01:10:37 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-05-13 12:00:15 -0700 |
| commit | e8550ee0329586b32de425e905c7af7e65bc78a8 (patch) | |
| tree | 0cdfe0f9f0d3fb010280ff0453fc553ab6ff2d92 /actionpack/lib/action_controller/base/base.rb | |
| parent | fa5da8ad54d68ea0484825845eb6f6a8e8bca361 (diff) | |
| download | rails-e8550ee0329586b32de425e905c7af7e65bc78a8.tar.gz rails-e8550ee0329586b32de425e905c7af7e65bc78a8.tar.bz2 rails-e8550ee0329586b32de425e905c7af7e65bc78a8.zip | |
Cherry-pick core extensions
Diffstat (limited to 'actionpack/lib/action_controller/base/base.rb')
| -rw-r--r-- | actionpack/lib/action_controller/base/base.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/base/base.rb b/actionpack/lib/action_controller/base/base.rb index d25801b17b..2813e71d12 100644 --- a/actionpack/lib/action_controller/base/base.rb +++ b/actionpack/lib/action_controller/base/base.rb @@ -1,5 +1,7 @@ require 'action_controller/deprecated' require 'set' +require 'active_support/core_ext/class/inheritable_attributes' +require 'active_support/core_ext/module/attr_internal' module ActionController #:nodoc: class ActionControllerError < StandardError #:nodoc: |