diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2011-09-06 02:50:27 -0700 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2011-09-06 02:50:27 -0700 |
| commit | 1fdd95d0840c4a9e64eae67e96e85f3ae7ee8b82 (patch) | |
| tree | 2ce7bdff89210559e8226cb1368fc4723bed5a53 /actionpack | |
| parent | bd17c762ae6982866e7da2544eb20e5586659786 (diff) | |
| parent | a76fbee9c9cd2dcd392a570e65ad1f4868763aa0 (diff) | |
| download | rails-1fdd95d0840c4a9e64eae67e96e85f3ae7ee8b82.tar.gz rails-1fdd95d0840c4a9e64eae67e96e85f3ae7ee8b82.tar.bz2 rails-1fdd95d0840c4a9e64eae67e96e85f3ae7ee8b82.zip | |
Merge pull request #2851 from dasch/patch-6
No need to use a begin block there
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/sprockets/helpers/rails_helper.rb | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/actionpack/lib/sprockets/helpers/rails_helper.rb b/actionpack/lib/sprockets/helpers/rails_helper.rb index bcb70ee95d..3987e6e17f 100644 --- a/actionpack/lib/sprockets/helpers/rails_helper.rb +++ b/actionpack/lib/sprockets/helpers/rails_helper.rb @@ -61,11 +61,9 @@ module Sprockets private def debug_assets? - begin - compile_assets? && (Rails.application.config.assets.debug || params[:debug_assets]) - rescue NoMethodError - false - end + compile_assets? && (Rails.application.config.assets.debug || params[:debug_assets]) + rescue NoMethodError + false end # Override to specify an alternative prefix for asset path generation. |