diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2016-02-23 19:55:49 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2016-02-23 21:11:15 -0300 |
| commit | 40fa818580a9277d8d1a02241f1422dbf83a8aa1 (patch) | |
| tree | 132e765683020927e21d920673a38b3220852c03 /actionmailer | |
| parent | 3d7b0d480467b17715941503b1fe598e57c13ac1 (diff) | |
| download | rails-40fa818580a9277d8d1a02241f1422dbf83a8aa1.tar.gz rails-40fa818580a9277d8d1a02241f1422dbf83a8aa1.tar.bz2 rails-40fa818580a9277d8d1a02241f1422dbf83a8aa1.zip | |
Move Caching module to Abstract Controller
Abstract Controller is the common component between Action Mailer and
Action Controller so if we need to share the caching component it need
to be there.
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/lib/action_mailer.rb | 1 | ||||
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb index 26fbb48600..55c017e338 100644 --- a/actionmailer/lib/action_mailer.rb +++ b/actionmailer/lib/action_mailer.rb @@ -44,7 +44,6 @@ module ActionMailer autoload :MailHelper autoload :Preview autoload :Previews, 'action_mailer/preview' - autoload :Caching autoload :TestCase autoload :TestHelper autoload :MessageDelivery 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 |