mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Remove hard require to ActionView from ActionMailer
This commit is contained in:
parent
6c7d895dda
commit
e868441896
3 changed files with 1 additions and 2 deletions
|
@ -22,7 +22,6 @@
|
||||||
#++
|
#++
|
||||||
|
|
||||||
require 'abstract_controller'
|
require 'abstract_controller'
|
||||||
require 'action_view'
|
|
||||||
require 'action_mailer/version'
|
require 'action_mailer/version'
|
||||||
|
|
||||||
# Common Active Support usage in Action Mailer
|
# Common Active Support usage in Action Mailer
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
require 'mail'
|
require 'mail'
|
||||||
require 'action_view/base'
|
|
||||||
require 'action_mailer/collector'
|
require 'action_mailer/collector'
|
||||||
require 'active_support/core_ext/string/inflections'
|
require 'active_support/core_ext/string/inflections'
|
||||||
require 'active_support/core_ext/hash/except'
|
require 'active_support/core_ext/hash/except'
|
||||||
|
|
|
@ -14,6 +14,7 @@ require 'action_mailer/test_case'
|
||||||
require 'mail'
|
require 'mail'
|
||||||
|
|
||||||
# Emulate AV railtie
|
# Emulate AV railtie
|
||||||
|
require 'action_view'
|
||||||
ActionMailer::Base.send(:include, ActionView::Layouts)
|
ActionMailer::Base.send(:include, ActionView::Layouts)
|
||||||
|
|
||||||
# Show backtraces for deprecated behavior for quicker cleanup.
|
# Show backtraces for deprecated behavior for quicker cleanup.
|
||||||
|
|
Loading…
Reference in a new issue