Merge branch 'master' of git://github.com/rails/rails

1 files changed, 31 insertions, 0 deletions

diff --git a/railties/lib/rails/configuration.rb b/railties/lib/rails/configuration.rb
index bd404f4a14..ee0fca6592 100644
--- a/railties/lib/rails/configuration.rb
+++ b/railties/lib/rails/configuration.rb
@@ -5,6 +5,37 @@ require 'rails/rack'
 
 module Rails
   module Configuration
+    class MiddlewareStackProxy #:nodoc:
+      def initialize
+        @operations = []
+      end
+
+      def insert_before(*args, &block)
+        @operations << [:insert_before, args, block]
+      end
+
+      alias :insert :insert_before
+
+      def insert_after(*args, &block)
+        @operations << [:insert_after, args, block]
+      end
+
+      def swap(*args, &block)
+        @operations << [:swap, args, block]
+      end
+
+      def use(*args, &block)
+        @operations << [:use, args, block]
+      end
+
+      def merge_into(other)
+        @operations.each do |operation, args, block|
+          other.send(operation, *args, &block)
+        end
+        other
+      end
+    end
+
     class Generators #:nodoc:
       attr_accessor :aliases, :options, :templates, :fallbacks, :colorize_logging