Skip to content
Browse files

Revert "Merge pull request #2647 from dmathieu/no_rescue"

This reverts commit 125b1b0.
  • Loading branch information...
1 parent 60d8e4a commit e5f2b0d75f29cd7d9e11e8008d410caf48ab1078 @spastorino spastorino committed Aug 30, 2011
Showing with 7 additions and 7 deletions.
  1. +6 −2 actionpack/lib/sprockets/helpers/rails_helper.rb
  2. +1 −5 actionpack/test/abstract_unit.rb
View
8 actionpack/lib/sprockets/helpers/rails_helper.rb
@@ -58,8 +58,12 @@ def asset_path(source, default_ext = nil, body = false, protocol = nil)
private
def debug_assets?
- config = Rails.application.config.assets
- config.allow_debugging && (config.debug || params[:debug_assets])
+ begin
+ config = Rails.application.config.assets
+ config.allow_debugging && (config.debug || params[:debug_assets])
+ rescue NoMethodError
+ false
+ end
end
# Override to specify an alternative prefix for asset path generation.
View
6 actionpack/test/abstract_unit.rb
@@ -142,11 +142,7 @@ def call(env)
end
class BasicController
- attr_accessor :request, :params
-
- def initialize
- @params = {}
- end
+ attr_accessor :request
def config
@config ||= ActiveSupport::InheritableOptions.new(ActionController::Base.config).tap do |config|

2 comments on commit e5f2b0d

@dmathieu

I'm sorry I didn't follow this. Why the revert ?

@spastorino
Ruby on Rails member

@dmathieu because of #2177 dbca49b

Please sign in to comment.
Something went wrong with that request. Please try again.