diff options
| author | Akira Matsuda <ronnie@dio.jp> | 2017-10-21 22:11:29 +0900 |
|---|---|---|
| committer | Akira Matsuda <ronnie@dio.jp> | 2017-10-21 22:48:27 +0900 |
| commit | 589dd0f6c9b5d6fe9de88b7bdabe83681abde2a4 (patch) | |
| tree | 901051893614de265554d4fc80e46e60137a0f66 /activesupport/lib/active_support/dependencies | |
| parent | 6a728491b66340345a91264b5983ad81944ab97a (diff) | |
| download | rails-589dd0f6c9b5d6fe9de88b7bdabe83681abde2a4.tar.gz rails-589dd0f6c9b5d6fe9de88b7bdabe83681abde2a4.tar.bz2 rails-589dd0f6c9b5d6fe9de88b7bdabe83681abde2a4.zip | |
[Active Support] require_relative => require
This basically reverts 8da30ad6be34339124ba4cb4e36aea260dda12bc
Diffstat (limited to 'activesupport/lib/active_support/dependencies')
| -rw-r--r-- | activesupport/lib/active_support/dependencies/autoload.rb | 2 | ||||
| -rw-r--r-- | activesupport/lib/active_support/dependencies/interlock.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/dependencies/autoload.rb b/activesupport/lib/active_support/dependencies/autoload.rb index 1c3775f5eb..1cee85d98f 100644 --- a/activesupport/lib/active_support/dependencies/autoload.rb +++ b/activesupport/lib/active_support/dependencies/autoload.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require_relative "../inflector/methods" +require "active_support/inflector/methods" module ActiveSupport # Autoload and eager load conveniences for your library. diff --git a/activesupport/lib/active_support/dependencies/interlock.rb b/activesupport/lib/active_support/dependencies/interlock.rb index 4e9595ed42..948be75638 100644 --- a/activesupport/lib/active_support/dependencies/interlock.rb +++ b/activesupport/lib/active_support/dependencies/interlock.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require_relative "../concurrency/share_lock" +require "active_support/concurrency/share_lock" module ActiveSupport #:nodoc: module Dependencies #:nodoc: |