diff options
| author | Xavier Noria <fxn@hashref.com> | 2017-07-02 14:35:13 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-02 14:35:13 -0700 |
| commit | 111736ddf6fe81f3e42af37dfa1b0520a8c91473 (patch) | |
| tree | 050eea5a719faa416b64b804617f8755b6500e09 /actionmailer | |
| parent | f443460670576cd82a806a851b7124479e8325c9 (diff) | |
| parent | 92c29d82eb2f323bb1338a039229a66057a7d137 (diff) | |
| download | rails-111736ddf6fe81f3e42af37dfa1b0520a8c91473.tar.gz rails-111736ddf6fe81f3e42af37dfa1b0520a8c91473.tar.bz2 rails-111736ddf6fe81f3e42af37dfa1b0520a8c91473.zip | |
Merge pull request #29638 from amatsuda/require_relative_2017
Using require_relative in the Rails codebase
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 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. |