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.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 '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 6d8bf28943..a12ca42c30 100644 --- a/railties/lib/rails.rb +++ b/railties/lib/rails.rb @@ -1,4 +1,4 @@ -require "rails/ruby_version_check" +require_relative "rails/ruby_version_check" require "pathname" @@ -9,8 +9,8 @@ require "active_support/core_ext/module/delegation" require "active_support/core_ext/array/extract_options" require "active_support/core_ext/object/blank" -require "rails/application" -require "rails/version" +require_relative "rails/application" +require_relative "rails/version" require "active_support/railtie" require "action_dispatch/railtie" @@ -48,7 +48,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 "rails/backtrace_cleaner" + require_relative "rails/backtrace_cleaner" Rails::BacktraceCleaner.new end end |