Unify sprockets config options

1 files changed, 4 insertions, 3 deletions

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