diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2016-10-10 21:38:59 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-10 21:38:59 -0300 |
| commit | c2fa53606d3c98ac8dd079a1e5b22da3290a513b (patch) | |
| tree | f6cb51b750c1ab0e725a4ecf41a5386af2b0bd8c /actionview/lib/action_view/template/error.rb | |
| parent | 36f6ab2d8e0ef84f520bb6169b61a8d79f222cfc (diff) | |
| parent | 6a78e0ecd6122a6b1be9a95e6c4e21e10e429513 (diff) | |
| download | rails-c2fa53606d3c98ac8dd079a1e5b22da3290a513b.tar.gz rails-c2fa53606d3c98ac8dd079a1e5b22da3290a513b.tar.bz2 rails-c2fa53606d3c98ac8dd079a1e5b22da3290a513b.zip | |
Merge pull request #26755 from rafaelfranca/deprecations
Remove deprecations in Active Model, Action View and Active Job
Diffstat (limited to 'actionview/lib/action_view/template/error.rb')
| -rw-r--r-- | actionview/lib/action_view/template/error.rb | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/actionview/lib/action_view/template/error.rb b/actionview/lib/action_view/template/error.rb index b95e5236a0..4010677477 100644 --- a/actionview/lib/action_view/template/error.rb +++ b/actionview/lib/action_view/template/error.rb @@ -63,23 +63,13 @@ module ActionView # Override to prevent #cause resetting during re-raise. attr_reader :cause - def initialize(template, original_exception = nil) - if original_exception - ActiveSupport::Deprecation.warn("Passing #original_exception is deprecated and has no effect. " \ - "Exceptions will automatically capture the original exception.", caller) - end - + def initialize(template) super($!.message) set_backtrace($!.backtrace) @cause = $! @template, @sub_templates = template, nil end - def original_exception - ActiveSupport::Deprecation.warn("#original_exception is deprecated. Use #cause instead.", caller) - cause - end - def file_name @template.identifier end |