diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2011-08-24 08:01:08 -0700 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2011-08-24 08:01:08 -0700 |
| commit | 976b2be1085aa22f84c6fcbe40ba25ba4f89051c (patch) | |
| tree | 8ac12a462f1d8d46770dafa397a4b2b4555adf89 /actionpack/lib | |
| parent | 23d8a980d24e8969dc71500378055dfedc9286ca (diff) | |
| parent | 827cdae6fb5e21056b68ab8a89047ae82738871f (diff) | |
| download | rails-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 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/sprockets/helpers/rails_helper.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/actionpack/lib/sprockets/helpers/rails_helper.rb b/actionpack/lib/sprockets/helpers/rails_helper.rb index a32fb1c57e..c50b0300d5 100644 --- a/actionpack/lib/sprockets/helpers/rails_helper.rb +++ b/actionpack/lib/sprockets/helpers/rails_helper.rb @@ -71,9 +71,10 @@ module Sprockets private def debug_assets? - params[:debug_assets] == '1' || - params[:debug_assets] == 'true' || - Rails.application.config.assets.debug + Rails.application.config.assets.allow_debugging && + (Rails.application.config.assets.debug || + params[:debug_assets] == '1' || + params[:debug_assets] == 'true') end # Override to specify an alternative prefix for asset path generation. |