TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 125b1b0b9180ec8f0135da185e77250d2b8a4bea.
This commit is contained in:
Santiago Pastorino 2011-08-30 20:47:01 -03:00
parent 60d8e4ac28
commit e5f2b0d75f
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
actionpack/lib/sprockets/helpers/rails_helper.rb
View File

@ -58,8 +58,12 @@ def asset_path(source, default_ext = nil, body = false, protocol = nil)
private private
def debug_assets? def debug_assets?
config = Rails.application.config.assets begin
config.allow_debugging && (config.debug || params[:debug_assets]) config = Rails.application.config.assets
config.allow_debugging && (config.debug || params[:debug_assets])
rescue NoMethodError
false
end
end end
# Override to specify an alternative prefix for asset path generation. # Override to specify an alternative prefix for asset path generation.

6
actionpack/test/abstract_unit.rb
View File

@ -142,11 +142,7 @@ def call(env)
end end
class BasicController class BasicController
attr_accessor :request, :params attr_accessor :request
def initialize
@params = {}
end
def config def config
@config ||= ActiveSupport::InheritableOptions.new(ActionController::Base.config).tap do |config| @config ||= ActiveSupport::InheritableOptions.new(ActionController::Base.config).tap do |config|