From 1f0f05b10c924d2f0d0ff4c74cbd979e77deea1d Mon Sep 17 00:00:00 2001
From: Carl Lerche <carllerche@mac.com>
Date: Wed, 3 Mar 2010 19:45:08 -0800
Subject: Move the original config method onto AbstractController

---
 actionpack/lib/action_controller/metal.rb | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'actionpack/lib/action_controller')

diff --git a/actionpack/lib/action_controller/metal.rb b/actionpack/lib/action_controller/metal.rb
index 1f6bbeb7c5..4374ab0a6b 100644
--- a/actionpack/lib/action_controller/metal.rb
+++ b/actionpack/lib/action_controller/metal.rb
@@ -11,14 +11,6 @@ module ActionController
   class Metal < AbstractController::Base
     abstract!
 
-    def self.config
-      @config ||= ActiveSupport::InheritableOptions.new(superclass < Metal ? superclass.config : {})
-    end
-
-    def config
-      self.class.config
-    end
-
     # :api: public
     attr_internal :params, :env
 
-- 
cgit v1.2.3