From cd9cc721ab54e2b0c7875cacf2113f03908a8bb7 Mon Sep 17 00:00:00 2001
From: Akira Matsuda <ronnie@dio.jp>
Date: Fri, 30 Jun 2017 14:16:21 +0900
Subject: [PATCH] [Action Mailer] require => require_relative

---
 actionmailer/lib/action_mailer.rb      | 2 +-
 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 8e59f033d00da..8eba811ab61c9 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 f8aa54bd44311..2b4992791db21 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.