aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/metal.rb
diff options
context:
space:
mode:
authorEmilio Tagua <miloops@gmail.com>2009-09-21 14:57:24 -0300
committerEmilio Tagua <miloops@gmail.com>2009-09-21 14:57:24 -0300
commita294d8362bfb62b7133ad0799ae1327cd5ddd1e4 (patch)
tree477930041d5c42f2453178ab110c8455c6d702fe /actionpack/lib/action_controller/metal.rb
parent378b02d3aa890cedabf1ef81c34a371dbbc52c25 (diff)
parente2d0b0ee61c5a8c2626abb5ac1029b48ec1965eb (diff)
downloadrails-a294d8362bfb62b7133ad0799ae1327cd5ddd1e4.tar.gz
rails-a294d8362bfb62b7133ad0799ae1327cd5ddd1e4.tar.bz2
rails-a294d8362bfb62b7133ad0799ae1327cd5ddd1e4.zip
Merge commit 'rails/master'
Diffstat (limited to 'actionpack/lib/action_controller/metal.rb')
-rw-r--r--actionpack/lib/action_controller/metal.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/metal.rb b/actionpack/lib/action_controller/metal.rb
index 6aa4fe6019..e9007d3631 100644
--- a/actionpack/lib/action_controller/metal.rb
+++ b/actionpack/lib/action_controller/metal.rb
@@ -1,3 +1,5 @@
+require 'active_support/core_ext/class/inheritable_attributes'
+
module ActionController
# ActionController::Metal provides a way to get a valid Rack application from a controller.
#