aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/sprockets
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2011-08-25 11:47:23 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2011-08-25 11:47:23 -0700
commit25ee30961a1785363e4329db569008623f022332 (patch)
tree61c91d9bf602119bcafcff85b2ed01bfa64e559a /actionpack/lib/sprockets
parenta840172c535ae1f8bf29a397185053b85d7b4398 (diff)
parent8724f00cbd3ed7d244d5f2f498b4d5e08d963a29 (diff)
downloadrails-25ee30961a1785363e4329db569008623f022332.tar.gz
rails-25ee30961a1785363e4329db569008623f022332.tar.bz2
rails-25ee30961a1785363e4329db569008623f022332.zip
Merge pull request #2695 from dasch/more-debug-assets
Don't require a specific value for the ?debug flag
Diffstat (limited to 'actionpack/lib/sprockets')
-rw-r--r--actionpack/lib/sprockets/helpers/rails_helper.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/actionpack/lib/sprockets/helpers/rails_helper.rb b/actionpack/lib/sprockets/helpers/rails_helper.rb
index bc1ab3c52a..a69cc8a29e 100644
--- a/actionpack/lib/sprockets/helpers/rails_helper.rb
+++ b/actionpack/lib/sprockets/helpers/rails_helper.rb
@@ -59,9 +59,7 @@ module Sprockets
private
def debug_assets?
config = Rails.application.config.assets
- param = params[:debug_assets]
-
- config.allow_debugging && (config.debug || param == '1' || param == 'true')
+ config.allow_debugging && (config.debug || params[:debug_assets])
end
# Override to specify an alternative prefix for asset path generation.