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 /actionpack/lib/action_controller/base.rb | |
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 'actionpack/lib/action_controller/base.rb')
-rw-r--r-- | actionpack/lib/action_controller/base.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 8c2b111f89..6e195fa359 100644 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -1,6 +1,6 @@ require "action_view" -require "action_controller/log_subscriber" -require "action_controller/metal/params_wrapper" +require_relative "log_subscriber" +require_relative "metal/params_wrapper" module ActionController # Action Controllers are the core of a web request in \Rails. They are made up of one or more actions that are executed |