aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2011-08-19 15:28:52 -0700
committerSantiago Pastorino <santiago@wyeworks.com>2011-08-19 15:28:52 -0700
commit8bd76aa50ec5dc5da3c398a0fd5dc971f64d8d68 (patch)
tree5d6d1d59edf8a9be688a4d1e2404335283bc23b0 /actionpack/lib
parent72bc89fac71a759189d179516f0eea01c212728c (diff)
parent7223f10acda3d5683e6de817bc7131ca109f3f28 (diff)
downloadrails-8bd76aa50ec5dc5da3c398a0fd5dc971f64d8d68.tar.gz
rails-8bd76aa50ec5dc5da3c398a0fd5dc971f64d8d68.tar.bz2
rails-8bd76aa50ec5dc5da3c398a0fd5dc971f64d8d68.zip
Merge pull request #2581 from guilleiguaran/debug-assets-in-dev
Debug assets by default in development and test environments
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/sprockets/helpers/rails_helper.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/sprockets/helpers/rails_helper.rb b/actionpack/lib/sprockets/helpers/rails_helper.rb
index ec3d36d5ad..a65c5992ca 100644
--- a/actionpack/lib/sprockets/helpers/rails_helper.rb
+++ b/actionpack/lib/sprockets/helpers/rails_helper.rb
@@ -70,8 +70,8 @@ module Sprockets
private
def debug_assets?
- params[:debug_assets] == '1' ||
- params[:debug_assets] == 'true'
+ Rails.env.development? || Rails.env.test? ||
+ params[:debug_assets] == '1' || params[:debug_assets] == 'true'
rescue NoMethodError
false
end