aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/metal/exceptions.rb
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2016-10-10 02:10:20 -0300
committerGitHub <noreply@github.com>2016-10-10 02:10:20 -0300
commit0cbb0be329e1375e415ad37c9c20ea9f74ff1ac3 (patch)
tree0d0363ee64c840cadf9e0e0d7e32de95633287ae /actionpack/lib/action_controller/metal/exceptions.rb
parent034e4d38b508cbf2a8eaa9742df3e1948e482827 (diff)
parentde9542acd56f60d281465a59eac11e15ca8b3323 (diff)
downloadrails-0cbb0be329e1375e415ad37c9c20ea9f74ff1ac3.tar.gz
rails-0cbb0be329e1375e415ad37c9c20ea9f74ff1ac3.tar.bz2
rails-0cbb0be329e1375e415ad37c9c20ea9f74ff1ac3.zip
Merge pull request #26746 from rails/deprecations
Remove all deprecations from Action Pack
Diffstat (limited to 'actionpack/lib/action_controller/metal/exceptions.rb')
-rw-r--r--actionpack/lib/action_controller/metal/exceptions.rb12
1 files changed, 1 insertions, 11 deletions
diff --git a/actionpack/lib/action_controller/metal/exceptions.rb b/actionpack/lib/action_controller/metal/exceptions.rb
index 56a4b085e2..3761e6172b 100644
--- a/actionpack/lib/action_controller/metal/exceptions.rb
+++ b/actionpack/lib/action_controller/metal/exceptions.rb
@@ -3,20 +3,10 @@ module ActionController
end
class BadRequest < ActionControllerError #:nodoc:
- def initialize(msg = nil, e = nil)
- if e
- ActiveSupport::Deprecation.warn("Passing #original_exception is deprecated and has no effect. " \
- "Exceptions will automatically capture the original exception.", caller)
- end
-
+ def initialize(msg = nil)
super(msg)
set_backtrace $!.backtrace if $!
end
-
- def original_exception
- ActiveSupport::Deprecation.warn("#original_exception is deprecated. Use #cause instead.", caller)
- cause
- end
end
class RenderError < ActionControllerError #:nodoc: