aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/lib/action_mailer
diff options
context:
space:
mode:
Diffstat (limited to 'actionmailer/lib/action_mailer')
-rw-r--r--actionmailer/lib/action_mailer/base.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index 25be5c3a7f..129aa1edfe 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -6,8 +6,6 @@ require 'active_support/core_ext/module/anonymous'
require 'action_mailer/log_subscriber'
-require 'action_dispatch/caching'
-
module ActionMailer
# Action Mailer allows you to send email from your application using a mailer model and views.
#
@@ -432,7 +430,7 @@ module ActionMailer
include AbstractController::Translation
include AbstractController::AssetPaths
include AbstractController::Callbacks
- include ActionDispatch::Caching
+ include AbstractController::Caching
include ActionView::Layouts