aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorCarlhuda <carlhuda@engineyard.com>2010-03-02 17:18:01 -0800
committerCarlhuda <carlhuda@engineyard.com>2010-03-03 15:49:52 -0800
commit664090348154ccbf1274a13bbc3d3c37ba35bc7d (patch)
tree0a92ab44f22737982830bb37572cde6d23722a89 /actionpack
parentbf9913f8f43a2436c644ad893d3d7034f7d7e256 (diff)
downloadrails-664090348154ccbf1274a13bbc3d3c37ba35bc7d.tar.gz
rails-664090348154ccbf1274a13bbc3d3c37ba35bc7d.tar.bz2
rails-664090348154ccbf1274a13bbc3d3c37ba35bc7d.zip
Move InheritableOptions into ActiveSupport
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_controller/metal.rb8
1 files changed, 0 insertions, 8 deletions
diff --git a/actionpack/lib/action_controller/metal.rb b/actionpack/lib/action_controller/metal.rb
index fbc8a9a15e..1f6bbeb7c5 100644
--- a/actionpack/lib/action_controller/metal.rb
+++ b/actionpack/lib/action_controller/metal.rb
@@ -1,14 +1,6 @@
require 'active_support/core_ext/class/attribute'
require 'active_support/ordered_options'
-module ActiveSupport
- class InheritableOptions < OrderedOptions
- def initialize(parent)
- super() { |h,k| parent[k] }
- end
- end
-end
-
module ActionController
# ActionController::Metal provides a way to get a valid Rack application from a controller.
#