aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
authorŁukasz Strzałkowski <lukasz.strzalkowski@gmail.com>2013-12-05 00:22:50 +0100
committerŁukasz Strzałkowski <lukasz.strzalkowski@gmail.com>2013-12-05 01:03:03 +0100
commite064658d64f7fb071ec35764f2d5203e8b58e044 (patch)
tree0109a9eb604e0b5a201540f40c265e4be69ff514 /actionmailer
parentd8888b94b32b28003ec247d0565e73dee731275e (diff)
downloadrails-e064658d64f7fb071ec35764f2d5203e8b58e044.tar.gz
rails-e064658d64f7fb071ec35764f2d5203e8b58e044.tar.bz2
rails-e064658d64f7fb071ec35764f2d5203e8b58e044.zip
Include AV::Layouts directly in AM::Base
No need to do this in railtie as AM depends on AV either way
Diffstat (limited to 'actionmailer')
-rw-r--r--actionmailer/lib/action_mailer/base.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index 6f8ae05539..5723b2cc1b 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -373,6 +373,8 @@ module ActionMailer
include AbstractController::AssetPaths
include AbstractController::Callbacks
+ include ActionView::Layouts
+
PROTECTED_IVARS = AbstractController::Rendering::DEFAULT_PROTECTED_INSTANCE_VARIABLES + [:@_action_has_layout]
def _protected_ivars # :nodoc: