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/app_loader.rb | |
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/app_loader.rb')
-rw-r--r-- | railties/lib/rails/app_loader.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/app_loader.rb b/railties/lib/rails/app_loader.rb index 3e9b3bd4bb..20eb75d95c 100644 --- a/railties/lib/rails/app_loader.rb +++ b/railties/lib/rails/app_loader.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require "pathname" -require_relative "version" +require "rails/version" module Rails module AppLoader # :nodoc: @@ -56,7 +56,7 @@ EOS $stderr.puts(BUNDLER_WARNING) Object.const_set(:APP_PATH, File.expand_path("config/application", Dir.pwd)) require File.expand_path("../boot", APP_PATH) - require_relative "commands" + require "rails/commands" break end end |