aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/sprockets
diff options
context:
space:
mode:
authorMark J. Titorenko <mark@titorenko.net>2011-09-06 10:34:24 +0100
committerGuillermo Iguaran <guilleiguaran@gmail.com>2011-09-13 18:16:52 -0500
commitf22407dd34024886edd8a8f618dc0b19152776a0 (patch)
tree611ceb688c22315084ae3cb654d49ce83c64fa1a /actionpack/lib/sprockets
parent3b8a7cf2a7b2ffce671ca7f655de736c1054edbc (diff)
downloadrails-f22407dd34024886edd8a8f618dc0b19152776a0.tar.gz
rails-f22407dd34024886edd8a8f618dc0b19152776a0.tar.bz2
rails-f22407dd34024886edd8a8f618dc0b19152776a0.zip
Don't mount Sprockets at config.assets.prefix if config.assets.compile is false.
Diffstat (limited to 'actionpack/lib/sprockets')
-rw-r--r--actionpack/lib/sprockets/railtie.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/actionpack/lib/sprockets/railtie.rb b/actionpack/lib/sprockets/railtie.rb
index dc991636a1..f05d835554 100644
--- a/actionpack/lib/sprockets/railtie.rb
+++ b/actionpack/lib/sprockets/railtie.rb
@@ -67,8 +67,10 @@ module Sprockets
end
end
- app.routes.prepend do
- mount app.assets => config.assets.prefix
+ if config.assets.compile
+ app.routes.prepend do
+ mount app.assets => config.assets.prefix
+ end
end
if config.assets.digest