Merge branch 'master' of github.com:lifo/docrails

1 files changed, 12 insertions, 2 deletions

diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index c95316a4da..4d05f8115c 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -99,9 +99,15 @@ module Rails
       end
     end
 
+    def app
+      @app ||= begin
+        reload_routes!
+        middleware.build(routes)
+      end
+    end
+
     def call(env)
-      @app ||= middleware.build(routes)
-      @app.call(env)
+      app.call(env)
     end
 
     initializer :load_application_initializers do
@@ -110,6 +116,10 @@ module Rails
       end
     end
 
+    initializer :build_middleware_stack do
+      app
+    end
+
     # Fires the user-supplied after_initialize block (Configuration#after_initialize)
     initializer :after_initialize do
       config.after_initialize_blocks.each do |block|