diff options
| author | José Valim <jose.valim@gmail.com> | 2012-01-05 13:58:58 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-01-05 13:58:58 -0800 |
| commit | 5e1cfb04a915e1f033c108c8c147981fae7b7925 (patch) | |
| tree | 4dcc8b7bf9740f81d4a1b4d980f267a5f2698352 /actionpack/lib | |
| parent | 6252ede43718e389947c7216c79d96a877590b17 (diff) | |
| parent | 63a58213bcdb51f11d51c55978d2ab4753615b9b (diff) | |
| download | rails-5e1cfb04a915e1f033c108c8c147981fae7b7925.tar.gz rails-5e1cfb04a915e1f033c108c8c147981fae7b7925.tar.bz2 rails-5e1cfb04a915e1f033c108c8c147981fae7b7925.zip | |
Merge pull request #4117 from lest/remove-deprecated
remove status_code from AD::ShowExceptions and useless requires
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/show_exceptions.rb | 6 | ||||
| -rw-r--r-- | actionpack/lib/action_view/base.rb | 1 |
2 files changed, 0 insertions, 7 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb index 3d06214bf1..836136eb95 100644 --- a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb +++ b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb @@ -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 @@ module ActionDispatch 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 diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb index 194b104c39..08149df423 100644 --- a/actionpack/lib/action_view/base.rb +++ b/actionpack/lib/action_view/base.rb @@ -3,7 +3,6 @@ require 'active_support/core_ext/module/delegation' 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 |