aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
authorAkira Matsuda <ronnie@dio.jp>2017-06-30 14:16:21 +0900
committerAkira Matsuda <ronnie@dio.jp>2017-07-01 18:38:05 +0900
commitcd9cc721ab54e2b0c7875cacf2113f03908a8bb7 (patch)
treef47d1b59dea2728e0d2eb54c2bee8aae453af020 /actionmailer
parentc4d1a4efeec6f0b5b58222993aa0bec85a19b6a8 (diff)
downloadrails-cd9cc721ab54e2b0c7875cacf2113f03908a8bb7.tar.gz
rails-cd9cc721ab54e2b0c7875cacf2113f03908a8bb7.tar.bz2
rails-cd9cc721ab54e2b0c7875cacf2113f03908a8bb7.zip
[Action Mailer] require => require_relative
Diffstat (limited to 'actionmailer')
-rw-r--r--actionmailer/lib/action_mailer.rb2
-rw-r--r--actionmailer/lib/action_mailer/base.rb6
2 files changed, 4 insertions, 4 deletions
diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb
index 8e59f033d0..8eba811ab6 100644
--- a/actionmailer/lib/action_mailer.rb
+++ b/actionmailer/lib/action_mailer.rb
@@ -22,7 +22,7 @@
#++
require "abstract_controller"
-require "action_mailer/version"
+require_relative "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 f8aa54bd44..2b4992791d 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -1,11 +1,11 @@
require "mail"
-require "action_mailer/collector"
+require_relative "collector"
require "active_support/core_ext/string/inflections"
require "active_support/core_ext/hash/except"
require "active_support/core_ext/module/anonymous"
-require "action_mailer/log_subscriber"
-require "action_mailer/rescuable"
+require_relative "log_subscriber"
+require_relative "rescuable"
module ActionMailer
# Action Mailer allows you to send email from your application using a mailer model and views.