1 files changed, 6 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index e0474ff5b3..81db0ed467 100755
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -310,6 +310,10 @@ module ActionController #:nodoc:
     # Turn on +ignore_missing_templates+ if you want to unit test actions without making the associated templates.
     cattr_accessor :ignore_missing_templates
 
+    # Controls the resource action separator
+    @@resource_action_separator = "/"
+    cattr_accessor :resource_action_separator
+
     # Holds the request object that's primarily used to get environment variables through access like
     # <tt>request.env["REQUEST_URI"]</tt>.
     attr_internal :request
@@ -605,11 +609,11 @@ module ActionController #:nodoc:
       def controller_path
         self.class.controller_path
       end
-      
+
       def session_enabled?
         request.session_options && request.session_options[:disabled] != false
       end
-      
+
       # View load paths for controller.
       def view_paths
         self.class.view_paths