diff options
| author | Akira Matsuda <ronnie@dio.jp> | 2017-10-21 22:08:33 +0900 |
|---|---|---|
| committer | Akira Matsuda <ronnie@dio.jp> | 2017-10-21 22:48:26 +0900 |
| commit | 6a728491b66340345a91264b5983ad81944ab97a (patch) | |
| tree | 7993335bc63d5d0a03d8f7863b29f9b333bbd2cb /railties/lib/rails/application | |
| parent | 01ae39660243bc5f0a986e20f9c9bff312b1b5f8 (diff) | |
| download | rails-6a728491b66340345a91264b5983ad81944ab97a.tar.gz rails-6a728491b66340345a91264b5983ad81944ab97a.tar.bz2 rails-6a728491b66340345a91264b5983ad81944ab97a.zip | |
[Railties] require_relative => require
This basically reverts 618268b4b9382f4bcf004a945fe2d85c0bd03e32
Diffstat (limited to 'railties/lib/rails/application')
| -rw-r--r-- | railties/lib/rails/application/bootstrap.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/application/configuration.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/railties/lib/rails/application/bootstrap.rb b/railties/lib/rails/application/bootstrap.rb index c24d4573a9..e3c0759f95 100644 --- a/railties/lib/rails/application/bootstrap.rb +++ b/railties/lib/rails/application/bootstrap.rb @@ -4,7 +4,7 @@ require "fileutils" require "active_support/notifications" require "active_support/dependencies" require "active_support/descendants_tracker" -require_relative "../secrets" +require "rails/secrets" module Rails class Application diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb index b65289177f..290ec13878 100644 --- a/railties/lib/rails/application/configuration.rb +++ b/railties/lib/rails/application/configuration.rb @@ -2,8 +2,8 @@ require "active_support/core_ext/kernel/reporting" require "active_support/file_update_checker" -require_relative "../engine/configuration" -require_relative "../source_annotation_extractor" +require "rails/engine/configuration" +require "rails/source_annotation_extractor" module Rails class Application |