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.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.rb')
-rw-r--r-- | railties/lib/rails.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/railties/lib/rails.rb b/railties/lib/rails.rb index 04bb9ba94a..092105d502 100644 --- a/railties/lib/rails.rb +++ b/railties/lib/rails.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require_relative "rails/ruby_version_check" +require "rails/ruby_version_check" require "pathname" @@ -11,8 +11,8 @@ require "active_support/core_ext/module/delegation" require "active_support/core_ext/array/extract_options" require "active_support/core_ext/object/blank" -require_relative "rails/application" -require_relative "rails/version" +require "rails/application" +require "rails/version" require "active_support/railtie" require "action_dispatch/railtie" @@ -50,7 +50,7 @@ module Rails def backtrace_cleaner @backtrace_cleaner ||= begin # Relies on Active Support, so we have to lazy load to postpone definition until Active Support has been loaded - require_relative "rails/backtrace_cleaner" + require "rails/backtrace_cleaner" Rails::BacktraceCleaner.new end end |