Rename option to config.asset_pipeline

1 files changed, 7 insertions, 1 deletions

diff --git a/railties/lib/rails/application/finisher.rb b/railties/lib/rails/application/finisher.rb
index b57af48615..3cfd8f5707 100644
--- a/railties/lib/rails/application/finisher.rb
+++ b/railties/lib/rails/application/finisher.rb
@@ -34,13 +34,19 @@ module Rails
       end
 
       initializer :add_sprockets_route do |app|
-        if config.use_sprockets
+        if config.asset_pipeline
           app.routes.append do
             mount app.assets => "/assets"
           end
         end
       end
 
+      initializer :set_sprockets_logger do |app|
+        if config.asset_pipeline
+          app.assets.logger = Rails.logger
+        end
+      end
+
       initializer :build_middleware_stack do
         build_middleware_stack
       end