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 /railties/lib/rails/engine | |
| 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 'railties/lib/rails/engine')
| -rw-r--r-- | railties/lib/rails/engine/commands.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/engine/configuration.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/engine/updater.rb | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/railties/lib/rails/engine/commands.rb b/railties/lib/rails/engine/commands.rb index b9ef63243a..5267b23d6c 100644 --- a/railties/lib/rails/engine/commands.rb +++ b/railties/lib/rails/engine/commands.rb @@ -4,4 +4,4 @@ unless defined?(APP_PATH) end end -require "rails/commands" +require_relative "../commands" diff --git a/railties/lib/rails/engine/configuration.rb b/railties/lib/rails/engine/configuration.rb index 0c40173c38..9c7e2942bc 100644 --- a/railties/lib/rails/engine/configuration.rb +++ b/railties/lib/rails/engine/configuration.rb @@ -1,4 +1,4 @@ -require "rails/railtie/configuration" +require_relative "../railtie/configuration" module Rails class Engine diff --git a/railties/lib/rails/engine/updater.rb b/railties/lib/rails/engine/updater.rb index 2ecf994a5c..af2bff1e59 100644 --- a/railties/lib/rails/engine/updater.rb +++ b/railties/lib/rails/engine/updater.rb @@ -1,5 +1,5 @@ -require "rails/generators" -require "rails/generators/rails/plugin/plugin_generator" +require_relative "../generators" +require_relative "../generators/rails/plugin/plugin_generator" module Rails class Engine |