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/core_ext/object/json.rb | |
| 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/core_ext/object/json.rb')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/object/json.rb | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/activesupport/lib/active_support/core_ext/object/json.rb b/activesupport/lib/active_support/core_ext/object/json.rb index 30495313d2..0a3b875f24 100644 --- a/activesupport/lib/active_support/core_ext/object/json.rb +++ b/activesupport/lib/active_support/core_ext/object/json.rb @@ -5,14 +5,14 @@ require "json" require "bigdecimal" require "uri/generic" require "pathname" -require_relative "../big_decimal/conversions" # for #to_s -require_relative "../hash/except" -require_relative "../hash/slice" -require_relative "instance_variables" +require "active_support/core_ext/big_decimal/conversions" # for #to_s +require "active_support/core_ext/hash/except" +require "active_support/core_ext/hash/slice" +require "active_support/core_ext/object/instance_variables" require "time" -require_relative "../time/conversions" -require_relative "../date_time/conversions" -require_relative "../date/conversions" +require "active_support/core_ext/time/conversions" +require "active_support/core_ext/date_time/conversions" +require "active_support/core_ext/date/conversions" # The JSON gem adds a few modules to Ruby core classes containing :to_json definition, overwriting # their default behavior. That said, we need to define the basic to_json method in all of them, |