aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/sprockets/helpers
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2011-08-24 07:02:03 -0700
committerSantiago Pastorino <santiago@wyeworks.com>2011-08-24 07:02:03 -0700
commitf162f84aa59f2978192877565b2ca4ce6d4d0997 (patch)
tree6d826c06a5c8e809015350250c8acc156974f370 /actionpack/lib/sprockets/helpers
parent61e663073a32a0b30cceda20cb2001f132678489 (diff)
parent13dd7758cedf6152835c4c72b69b1fe631a60733 (diff)
downloadrails-f162f84aa59f2978192877565b2ca4ce6d4d0997.tar.gz
rails-f162f84aa59f2978192877565b2ca4ce6d4d0997.tar.bz2
rails-f162f84aa59f2978192877565b2ca4ce6d4d0997.zip
Merge pull request #2647 from dmathieu/no_rescue
remove useless rescue
Diffstat (limited to 'actionpack/lib/sprockets/helpers')
-rw-r--r--actionpack/lib/sprockets/helpers/rails_helper.rb9
1 files changed, 3 insertions, 6 deletions
diff --git a/actionpack/lib/sprockets/helpers/rails_helper.rb b/actionpack/lib/sprockets/helpers/rails_helper.rb
index 7200ab1ddd..4fb8d0af37 100644
--- a/actionpack/lib/sprockets/helpers/rails_helper.rb
+++ b/actionpack/lib/sprockets/helpers/rails_helper.rb
@@ -70,12 +70,9 @@ module Sprockets
private
def debug_assets?
- begin
- params[:debug_assets] == '1' ||
- params[:debug_assets] == 'true'
- rescue NoMethodError
- false
- end || Rails.application.config.assets.debug
+ params[:debug_assets] == '1' ||
+ params[:debug_assets] == 'true' ||
+ Rails.application.config.assets.debug
end
# Override to specify an alternative prefix for asset path generation.