Permalink
Browse files

Integrate ActionMailer with ActionView

  • Loading branch information...
1 parent 757170d commit 8e5a7243a1d408476e89a0fe4fd50bfde732e9ea @lukaszx0 lukaszx0 committed Jun 27, 2013
Showing with 6 additions and 2 deletions.
  1. +1 −0 actionmailer/actionmailer.gemspec
  2. +5 −2 actionmailer/lib/action_mailer/base.rb
@@ -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
@@ -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

0 comments on commit 8e5a724

Please sign in to comment.