aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/application/configuration.rb
diff options
context:
space:
mode:
authorGuillermo Iguaran <guilleiguaran@gmail.com>2011-08-29 16:28:11 -0500
committerGuillermo Iguaran <guilleiguaran@gmail.com>2011-08-31 12:41:28 -0500
commitdffdd829930e664cef522f34730d5987be348596 (patch)
tree6ccbfc5d488ac58269484e9bc932a269d07bc9ab /railties/lib/rails/application/configuration.rb
parent508f33f35c9ce7a8973c1cf3466223313dfcfb24 (diff)
downloadrails-dffdd829930e664cef522f34730d5987be348596.tar.gz
rails-dffdd829930e664cef522f34730d5987be348596.tar.bz2
rails-dffdd829930e664cef522f34730d5987be348596.zip
Read digests of assets from manifest.yml if config.assets.manifest is on
Diffstat (limited to 'railties/lib/rails/application/configuration.rb')
-rw-r--r--railties/lib/rails/application/configuration.rb9
1 files changed, 5 insertions, 4 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index 5d7bd3282d..7f4db0a19f 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -42,10 +42,11 @@ module Rails
@assets.version = ''
@assets.debug = false
@assets.allow_debugging = false
-
- @assets.cache_store = [ :file_store, "#{root}/tmp/cache/assets/" ]
- @assets.js_compressor = nil
- @assets.css_compressor = nil
+ @assets.manifest = true
+ @assets.precompile_only = false
+ @assets.cache_store = [ :file_store, "#{root}/tmp/cache/assets/" ]
+ @assets.js_compressor = nil
+ @assets.css_compressor = nil
end
def compiled_asset_path