Rename option to config.asset_pipeline

2 files changed, 9 insertions, 3 deletions

diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index 8dbc596357..81127e5e5f 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -10,7 +10,7 @@ module Rails
                     :preload_frameworks, :reload_plugins,
                     :secret_token, :serve_static_assets, :session_options,
                     :time_zone, :whiny_nils,
-                    :use_sprockets, :compile_assets
+                    :asset_pipeline, :compile_assets
 
       attr_writer :log_level
 
@@ -29,7 +29,7 @@ module Rails
         @log_level                   = nil
         @middleware                  = app_middleware
         @generators                  = app_generators
-        @use_sprockets               = false
+        @asset_pipeline              = false
         @compile_assets              = []
       end
 
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