diff --git a/actionpack/lib/action_dispatch/middleware/templates/rescues/_request_and_response.html.erb b/actionpack/lib/action_dispatch/middleware/templates/rescues/_request_and_response.html.erb index 04271d8e8a..fedeafc3e7 100644 --- a/actionpack/lib/action_dispatch/middleware/templates/rescues/_request_and_response.html.erb +++ b/actionpack/lib/action_dispatch/middleware/templates/rescues/_request_and_response.html.erb @@ -1,10 +1,3 @@ -<% unless @exception.blamed_files.blank? %> - <% if (hide = @exception.blamed_files.length > 8) %> - Toggle blamed files - <% end %> -
><%= @exception.describe_blame %>
-<% end %> -

Request

<% if params_valid? %>

Parameters:

<%= debug_params(@request.filtered_parameters) %>
diff --git a/actionpack/lib/action_dispatch/middleware/templates/rescues/layout.erb b/actionpack/lib/action_dispatch/middleware/templates/rescues/layout.erb index 974aa18c05..f49bee3437 100644 --- a/actionpack/lib/action_dispatch/middleware/templates/rescues/layout.erb +++ b/actionpack/lib/action_dispatch/middleware/templates/rescues/layout.erb @@ -239,9 +239,6 @@ var hide = function(id) { document.getElementById(id).style.display = 'none'; } - var toggleTrace = function() { - return toggle('blame_trace'); - } var toggleSessionDump = function() { return toggle('session_dump'); } diff --git a/activesupport/lib/active_support/dependencies.rb b/activesupport/lib/active_support/dependencies.rb index 17dc8c22db..9c4c7cd6f1 100644 --- a/activesupport/lib/active_support/dependencies.rb +++ b/activesupport/lib/active_support/dependencies.rb @@ -298,9 +298,6 @@ module ActiveSupport #:nodoc: else yield end - rescue Exception => exception # errors from loading file - exception.blame_file! file if exception.respond_to? :blame_file! - raise end # Mark the given constant as unloadable. Unloadable constants are removed @@ -334,31 +331,9 @@ module ActiveSupport #:nodoc: end end - # Exception file-blaming. - module Blamable #:nodoc: - def blame_file!(file) - (@blamed_files ||= []).unshift file - end - - def blamed_files - @blamed_files ||= [] - end - - def describe_blame - return nil if blamed_files.empty? - "This error occurred while loading the following files:\n #{blamed_files.join "\n "}" - end - - def copy_blame!(exc) - @blamed_files = exc.blamed_files.clone - self - end - end - def hook! Loadable.include_into(Object) ModuleConstMissing.include_into(Module) - Exception.include(Blamable) end def unhook! @@ -381,7 +356,6 @@ module ActiveSupport #:nodoc: load_error.message end load_error_message.replace(message % file_name) - load_error.copy_blame!(load_error) end raise end diff --git a/activesupport/test/dependencies/raises_exception_without_blame_file.rb b/activesupport/test/dependencies/raises_exception_without_blame_file.rb deleted file mode 100644 index 3a6533cd3a..0000000000 --- a/activesupport/test/dependencies/raises_exception_without_blame_file.rb +++ /dev/null @@ -1,7 +0,0 @@ -# frozen_string_literal: true - -exception = Exception.new("I am not blamable!") -class << exception - undef_method(:blame_file!) -end -raise exception diff --git a/activesupport/test/dependencies_test.rb b/activesupport/test/dependencies_test.rb index b459269903..0090066151 100644 --- a/activesupport/test/dependencies_test.rb +++ b/activesupport/test/dependencies_test.rb @@ -104,13 +104,6 @@ class DependenciesTest < ActiveSupport::TestCase end end - def test_dependency_which_raises_doesnt_blindly_call_blame_file! - with_loading do - filename = "dependencies/raises_exception_without_blame_file" - assert_raises(Exception) { require_dependency filename } - end - end - def test_warnings_should_be_enabled_on_first_load with_loading "dependencies" do old_warnings, ActiveSupport::Dependencies.warnings_on_first_load = ActiveSupport::Dependencies.warnings_on_first_load, true