Merge branch 'sprockets'

1 files changed, 21 insertions, 0 deletions

diff --git a/railties/lib/rails/application/finisher.rb b/railties/lib/rails/application/finisher.rb
index a45b61c99c..bae464a840 100644
--- a/railties/lib/rails/application/finisher.rb
+++ b/railties/lib/rails/application/finisher.rb
@@ -33,6 +33,27 @@ module Rails
         end
       end
 
+      initializer :add_sprockets_route do |app|
+        assets = config.assets
+        if assets.enabled
+          app.routes.append do
+            mount app.assets => assets.prefix
+          end
+        end
+      end
+
+      initializer :set_sprockets_logger do |app|
+        if config.assets.enabled
+          app.assets.logger = Rails.logger
+        end
+      end
+
+      initializer :index_sprockets_environment do |app|
+        if config.assets.enabled && config.action_controller.perform_caching
+          app.assets = app.assets.index
+        end
+      end
+
       initializer :build_middleware_stack do
         build_middleware_stack
       end