aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
authorŁukasz Strzałkowski <lukasz.strzalkowski@gmail.com>2013-07-30 00:50:24 +0200
committerŁukasz Strzałkowski <lukasz.strzalkowski@gmail.com>2013-08-25 11:39:12 +0200
commite868441896b17ec1ae1a3b7640ff8b302c31a983 (patch)
treebe0bac4adb97f20286f07ae5449c4cee7439568d /actionmailer
parent6c7d895ddae5a7a696a9a047e025e9e4e305f790 (diff)
downloadrails-e868441896b17ec1ae1a3b7640ff8b302c31a983.tar.gz
rails-e868441896b17ec1ae1a3b7640ff8b302c31a983.tar.bz2
rails-e868441896b17ec1ae1a3b7640ff8b302c31a983.zip
Remove hard require to ActionView from ActionMailer
Diffstat (limited to 'actionmailer')
-rw-r--r--actionmailer/lib/action_mailer.rb1
-rw-r--r--actionmailer/lib/action_mailer/base.rb1
-rw-r--r--actionmailer/test/abstract_unit.rb1
3 files changed, 1 insertions, 2 deletions
diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb
index c45124be80..5b6960c8fc 100644
--- a/actionmailer/lib/action_mailer.rb
+++ b/actionmailer/lib/action_mailer.rb
@@ -22,7 +22,6 @@
#++
require 'abstract_controller'
-require 'action_view'
require 'action_mailer/version'
# Common Active Support usage in Action Mailer
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index fba2e00166..ada86fbc4f 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -1,5 +1,4 @@
require 'mail'
-require 'action_view/base'
require 'action_mailer/collector'
require 'active_support/core_ext/string/inflections'
require 'active_support/core_ext/hash/except'
diff --git a/actionmailer/test/abstract_unit.rb b/actionmailer/test/abstract_unit.rb
index 1890853952..aa18c512c7 100644
--- a/actionmailer/test/abstract_unit.rb
+++ b/actionmailer/test/abstract_unit.rb
@@ -14,6 +14,7 @@ require 'action_mailer/test_case'
require 'mail'
# Emulate AV railtie
+require 'action_view'
ActionMailer::Base.send(:include, ActionView::Layouts)
# Show backtraces for deprecated behavior for quicker cleanup.