Permalink
Browse files

Merge pull request #4117 from lest/remove-deprecated

remove status_code from AD::ShowExceptions and useless requires
  • Loading branch information...
2 parents 6252ede + 63a5821 commit 5e1cfb04a915e1f033c108c8c147981fae7b7925 @josevalim josevalim committed Jan 5, 2012
@@ -1,6 +1,5 @@
require 'action_dispatch/http/request'
require 'action_dispatch/middleware/exception_wrapper'
-require 'active_support/deprecation'
module ActionDispatch
# This middleware rescues any exception returned by the application
@@ -39,11 +38,6 @@ def call(env)
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)
wrapper = ExceptionWrapper.new(env, exception)
status = wrapper.status_code
@@ -3,7 +3,6 @@
require 'active_support/core_ext/class/attribute'
require 'active_support/ordered_options'
require 'action_view/log_subscriber'
-require 'active_support/core_ext/module/deprecation'
module ActionView #:nodoc:
# = Action View Base

0 comments on commit 5e1cfb0

Please sign in to comment.