aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/sprockets
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2011-09-13 16:40:53 -0700
committerSantiago Pastorino <santiago@wyeworks.com>2011-09-13 16:40:53 -0700
commit410b0ec1b712ce34f0fafb6505876d21e8007db7 (patch)
tree358a8ebd476cb626f3fbad0e15473ff9522c6d40 /actionpack/lib/sprockets
parent3b8a7cf2a7b2ffce671ca7f655de736c1054edbc (diff)
parenta89d39ec889c2658120e508bd182de7be3ccdcc9 (diff)
downloadrails-410b0ec1b712ce34f0fafb6505876d21e8007db7.tar.gz
rails-410b0ec1b712ce34f0fafb6505876d21e8007db7.tar.bz2
rails-410b0ec1b712ce34f0fafb6505876d21e8007db7.zip
Merge pull request #3011 from guilleiguaran/disable-sprockets-server
Don't mount Sprockets if config.assets.compile is disabled
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