aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/application
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2011-08-24 08:01:08 -0700
committerSantiago Pastorino <santiago@wyeworks.com>2011-08-24 08:01:08 -0700
commit976b2be1085aa22f84c6fcbe40ba25ba4f89051c (patch)
tree8ac12a462f1d8d46770dafa397a4b2b4555adf89 /railties/lib/rails/application
parent23d8a980d24e8969dc71500378055dfedc9286ca (diff)
parent827cdae6fb5e21056b68ab8a89047ae82738871f (diff)
downloadrails-976b2be1085aa22f84c6fcbe40ba25ba4f89051c.tar.gz
rails-976b2be1085aa22f84c6fcbe40ba25ba4f89051c.tar.bz2
rails-976b2be1085aa22f84c6fcbe40ba25ba4f89051c.zip
Merge pull request #2644 from guilleiguaran/allow-assets-debugging
Add config.allow_debugging option
Diffstat (limited to 'railties/lib/rails/application')
-rw-r--r--railties/lib/rails/application/configuration.rb13
1 files changed, 7 insertions, 6 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index f1add68890..c4a02ba5c0 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -33,12 +33,13 @@ module Rails
@cache_store = [ :file_store, "#{root}/tmp/cache/" ]
@assets = ActiveSupport::OrderedOptions.new
- @assets.enabled = false
- @assets.paths = []
- @assets.precompile = [ /\w+\.(?!js|css).+/, /application.(css|js)$/ ]
- @assets.prefix = "/assets"
- @assets.version = ''
- @assets.debug = false
+ @assets.enabled = false
+ @assets.paths = []
+ @assets.precompile = [ /\w+\.(?!js|css).+/, /application.(css|js)$/ ]
+ @assets.prefix = "/assets"
+ @assets.version = ''
+ @assets.debug = false
+ @assets.allow_debugging = false
@assets.cache_store = [ :file_store, "#{root}/tmp/cache/assets/" ]
@assets.js_compressor = nil