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/date_time/conversions.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/date_time/conversions.rb')
-rw-r--r-- | activesupport/lib/active_support/core_ext/date_time/conversions.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/activesupport/lib/active_support/core_ext/date_time/conversions.rb b/activesupport/lib/active_support/core_ext/date_time/conversions.rb index e4c8f9898d..29725c89f7 100644 --- a/activesupport/lib/active_support/core_ext/date_time/conversions.rb +++ b/activesupport/lib/active_support/core_ext/date_time/conversions.rb @@ -1,10 +1,10 @@ # frozen_string_literal: true require "date" -require_relative "../../inflector/methods" -require_relative "../time/conversions" -require_relative "calculations" -require_relative "../../values/time_zone" +require "active_support/inflector/methods" +require "active_support/core_ext/time/conversions" +require "active_support/core_ext/date_time/calculations" +require "active_support/values/time_zone" class DateTime # Convert to a formatted string. See Time::DATE_FORMATS for predefined formats. |