1 files changed, 7 insertions, 0 deletions
diff --git a/railties/lib/rails/initializer.rb b/railties/lib/rails/initializer.rb
index 3065a8d111..e6f42f643c 100644
--- a/railties/lib/rails/initializer.rb
+++ b/railties/lib/rails/initializer.rb
@@ -269,6 +269,13 @@ module Rails
     end
   end
 
+  # Include middleware to serve up static assets
+  Initializer.default.add :initialize_static_server do
+    if configuration.frameworks.include?(:action_controller) && configuration.serve_static_assets
+      configuration.middleware.insert(0, Rails::Rack::Static, Rails.public_path)
+    end
+  end
+
   Initializer.default.add :initialize_cache do
     unless defined?(RAILS_CACHE)
       silence_warnings { Object.const_set "RAILS_CACHE", ActiveSupport::Cache.lookup_store(configuration.cache_store) }