aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/application/configuration.rb
diff options
context:
space:
mode:
authorGuillermo Iguaran <guilleiguaran@gmail.com>2011-08-31 12:47:33 -0500
committerGuillermo Iguaran <guilleiguaran@gmail.com>2011-08-31 13:12:09 -0500
commitf236e00189b5a6cf0cebac5c275f64d41d73428d (patch)
treeb698934e71ef9d329ccc14fef545239faf9f6362 /railties/lib/rails/application/configuration.rb
parentfa04c37f45ca9299a5efb426913488b678c178ce (diff)
downloadrails-f236e00189b5a6cf0cebac5c275f64d41d73428d.tar.gz
rails-f236e00189b5a6cf0cebac5c275f64d41d73428d.tar.bz2
rails-f236e00189b5a6cf0cebac5c275f64d41d73428d.zip
Backport f443f9cb0c64 to master
Diffstat (limited to 'railties/lib/rails/application/configuration.rb')
-rw-r--r--railties/lib/rails/application/configuration.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index 7f4db0a19f..85e0cd5061 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -41,9 +41,8 @@ module Rails
@assets.prefix = "/assets"
@assets.version = ''
@assets.debug = false
- @assets.allow_debugging = false
- @assets.manifest = true
- @assets.precompile_only = false
+ @assets.compile = true
+ @assets.digest = false
@assets.cache_store = [ :file_store, "#{root}/tmp/cache/assets/" ]
@assets.js_compressor = nil
@assets.css_compressor = nil