Removed deprecated `#original_exception` in `ActionView::Template::Error`.

2 files changed, 5 insertions, 11 deletions

diff --git a/actionview/CHANGELOG.md b/actionview/CHANGELOG.md
index e93745c3bf..67bd9b5c8f 100644
--- a/actionview/CHANGELOG.md
+++ b/actionview/CHANGELOG.md
@@ -1,3 +1,7 @@
+*   Removed deprecated `#original_exception` in `ActionView::Template::Error`.
+
+    *Rafael Mendonça França*
+
 *   Render now accepts any keys for locals, including reserved words
 
     Only locals with valid variable names get set directly. Others
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