aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorCarl Lerche <carllerche@mac.com>2010-03-03 21:29:26 -0800
committerCarl Lerche <carllerche@mac.com>2010-03-03 21:29:26 -0800
commit7dbf5c820b3454da8194e2c823cdfd3982657f03 (patch)
treefc21d9b2a645b5fe8c0dc6a6c3b6ff9d292bace7 /actionpack/lib/action_controller
parent15b3b74624eb4c5ae383956950cab12ca9899131 (diff)
downloadrails-7dbf5c820b3454da8194e2c823cdfd3982657f03.tar.gz
rails-7dbf5c820b3454da8194e2c823cdfd3982657f03.tar.bz2
rails-7dbf5c820b3454da8194e2c823cdfd3982657f03.zip
Tweak how ActionPack handles InheritableOptions
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/metal.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal.rb b/actionpack/lib/action_controller/metal.rb
index 4374ab0a6b..5e0ed201cb 100644
--- a/actionpack/lib/action_controller/metal.rb
+++ b/actionpack/lib/action_controller/metal.rb
@@ -1,5 +1,4 @@
require 'active_support/core_ext/class/attribute'
-require 'active_support/ordered_options'
module ActionController
# ActionController::Metal provides a way to get a valid Rack application from a controller.