Merge commit 'rails/master'

1 files changed, 8 insertions, 5 deletions

diff --git a/actionpack/lib/action_controller/new_base/hide_actions.rb b/actionpack/lib/action_controller/new_base/hide_actions.rb
index 422ea180c4..d1857a9169 100644
--- a/actionpack/lib/action_controller/new_base/hide_actions.rb
+++ b/actionpack/lib/action_controller/new_base/hide_actions.rb
@@ -1,25 +1,28 @@
 module ActionController
   module HideActions
+    extend ActiveSupport::DependencyModule
+
     included do
       extlib_inheritable_accessor :hidden_actions
       self.hidden_actions ||= Set.new
     end
 
     def action_methods() self.class.action_names end
-    def action_names() action_methods end
-
+    def action_names() action_methods end    
+      
   private
+  
     def respond_to_action?(action_name)
       !hidden_actions.include?(action_name) && (super || respond_to?(:method_missing))
     end
-
+    
     module ClassMethods
       def hide_action(*args)
         args.each do |arg|
           self.hidden_actions << arg.to_s
         end
       end
-
+      
       def action_methods
         @action_names ||= Set.new(super.reject {|name| self.hidden_actions.include?(name.to_s)})
       end
@@ -27,4 +30,4 @@ module ActionController
       def self.action_names() action_methods end
     end
   end
-end
+end
\ No newline at end of file