diff options
| author | Akira Matsuda <ronnie@dio.jp> | 2017-10-21 22:22:17 +0900 |
|---|---|---|
| committer | Akira Matsuda <ronnie@dio.jp> | 2017-10-21 22:48:28 +0900 |
| commit | a53a52d8ca6741b9884bcbdef98cd80b0b9c8bd5 (patch) | |
| tree | a5ae4f502e4dbb3cbb78bd1a5623e8e2d11e760c /actionmailer | |
| parent | 8ae2fdd267d59d394be3e6724b357b11a8046784 (diff) | |
| download | rails-a53a52d8ca6741b9884bcbdef98cd80b0b9c8bd5.tar.gz rails-a53a52d8ca6741b9884bcbdef98cd80b0b9c8bd5.tar.bz2 rails-a53a52d8ca6741b9884bcbdef98cd80b0b9c8bd5.zip | |
[Action Mailer] require_relative => require
This basically reverts cd9cc721ab54e2b0c7875cacf2113f03908a8bb7
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/lib/action_mailer.rb | 2 | ||||
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb index a170eb7917..ade3fe39a2 100644 --- a/actionmailer/lib/action_mailer.rb +++ b/actionmailer/lib/action_mailer.rb @@ -24,7 +24,7 @@ #++ require "abstract_controller" -require_relative "action_mailer/version" +require "action_mailer/version" # Common Active Support usage in Action Mailer require "active_support" diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index 1c1e1a9a3b..eb8ae59533 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -1,13 +1,13 @@ # frozen_string_literal: true require "mail" -require_relative "collector" +require "action_mailer/collector" require "active_support/core_ext/string/inflections" require "active_support/core_ext/hash/except" require "active_support/core_ext/module/anonymous" -require_relative "log_subscriber" -require_relative "rescuable" +require "action_mailer/log_subscriber" +require "action_mailer/rescuable" module ActionMailer # Action Mailer allows you to send email from your application using a mailer model and views. |