diff options
| author | Łukasz Strzałkowski <lukasz.strzalkowski@gmail.com> | 2013-06-27 14:45:29 +0200 |
|---|---|---|
| committer | Łukasz Strzałkowski <lukasz.strzalkowski@gmail.com> | 2013-08-25 11:39:08 +0200 |
| commit | 8e5a7243a1d408476e89a0fe4fd50bfde732e9ea (patch) | |
| tree | 91e239c0d4e4c89344fd6adf3b2cd7be0c06c2a0 /actionmailer | |
| parent | 757170dca4d2c6e198f4ccc04e3d5de60c614097 (diff) | |
| download | rails-8e5a7243a1d408476e89a0fe4fd50bfde732e9ea.tar.gz rails-8e5a7243a1d408476e89a0fe4fd50bfde732e9ea.tar.bz2 rails-8e5a7243a1d408476e89a0fe4fd50bfde732e9ea.zip | |
Integrate ActionMailer with ActionView
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/actionmailer.gemspec | 1 | ||||
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/actionmailer/actionmailer.gemspec b/actionmailer/actionmailer.gemspec index c56b6979ef..9b25feaf75 100644 --- a/actionmailer/actionmailer.gemspec +++ b/actionmailer/actionmailer.gemspec @@ -20,6 +20,7 @@ Gem::Specification.new do |s| s.requirements << 'none' s.add_dependency 'actionpack', version + s.add_dependency 'actionview', version s.add_dependency 'mail', '~> 2.5.4' end diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index cc3a412221..0928d3a639 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -1,4 +1,5 @@ require 'mail' +require 'action_view/base' require 'action_mailer/collector' require 'active_support/core_ext/string/inflections' require 'active_support/core_ext/hash/except' @@ -361,11 +362,13 @@ module ActionMailer # <tt>delivery_method :test</tt>. Most useful for unit and functional testing. class Base < AbstractController::Base include DeliveryMethods + abstract! + include ActionView::Rendering + include ActionView::Layouts + include AbstractController::Logger - include AbstractController::Rendering - include AbstractController::Layouts include AbstractController::Helpers include AbstractController::Translation include AbstractController::AssetPaths |