mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Merge pull request #4117 from lest/remove-deprecated
remove status_code from AD::ShowExceptions and useless requires
This commit is contained in:
commit
5e1cfb04a9
2 changed files with 0 additions and 7 deletions
|
@ -1,6 +1,5 @@
|
||||||
require 'action_dispatch/http/request'
|
require 'action_dispatch/http/request'
|
||||||
require 'action_dispatch/middleware/exception_wrapper'
|
require 'action_dispatch/middleware/exception_wrapper'
|
||||||
require 'active_support/deprecation'
|
|
||||||
|
|
||||||
module ActionDispatch
|
module ActionDispatch
|
||||||
# This middleware rescues any exception returned by the application
|
# This middleware rescues any exception returned by the application
|
||||||
|
@ -39,11 +38,6 @@ module ActionDispatch
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
# Define this method because some plugins were monkey patching it.
|
|
||||||
# Remove this after 3.2 is out with the other deprecations in this class.
|
|
||||||
def status_code(*)
|
|
||||||
end
|
|
||||||
|
|
||||||
def render_exception(env, exception)
|
def render_exception(env, exception)
|
||||||
wrapper = ExceptionWrapper.new(env, exception)
|
wrapper = ExceptionWrapper.new(env, exception)
|
||||||
status = wrapper.status_code
|
status = wrapper.status_code
|
||||||
|
|
|
@ -3,7 +3,6 @@ require 'active_support/core_ext/module/delegation'
|
||||||
require 'active_support/core_ext/class/attribute'
|
require 'active_support/core_ext/class/attribute'
|
||||||
require 'active_support/ordered_options'
|
require 'active_support/ordered_options'
|
||||||
require 'action_view/log_subscriber'
|
require 'action_view/log_subscriber'
|
||||||
require 'active_support/core_ext/module/deprecation'
|
|
||||||
|
|
||||||
module ActionView #:nodoc:
|
module ActionView #:nodoc:
|
||||||
# = Action View Base
|
# = Action View Base
|
||||||
|
|
Loading…
Reference in a new issue