From 589dd0f6c9b5d6fe9de88b7bdabe83681abde2a4 Mon Sep 17 00:00:00 2001
From: Akira Matsuda <ronnie@dio.jp>
Date: Sat, 21 Oct 2017 22:11:29 +0900
Subject: [Active Support] require_relative => require

This basically reverts 8da30ad6be34339124ba4cb4e36aea260dda12bc
---
 activesupport/lib/active_support/deprecation/behaviors.rb          | 4 ++--
 activesupport/lib/active_support/deprecation/constant_accessor.rb  | 2 +-
 activesupport/lib/active_support/deprecation/instance_delegator.rb | 4 ++--
 activesupport/lib/active_support/deprecation/method_wrappers.rb    | 4 ++--
 activesupport/lib/active_support/deprecation/proxy_wrappers.rb     | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'activesupport/lib/active_support/deprecation')

diff --git a/activesupport/lib/active_support/deprecation/behaviors.rb b/activesupport/lib/active_support/deprecation/behaviors.rb
index 967320bcb9..581db5f449 100644
--- a/activesupport/lib/active_support/deprecation/behaviors.rb
+++ b/activesupport/lib/active_support/deprecation/behaviors.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "../notifications"
+require "active_support/notifications"
 
 module ActiveSupport
   # Raised when <tt>ActiveSupport::Deprecation::Behavior#behavior</tt> is set with <tt>:raise</tt>.
@@ -27,7 +27,7 @@ module ActiveSupport
             if defined?(Rails.logger) && Rails.logger
               Rails.logger
             else
-              require_relative "../logger"
+              require "active_support/logger"
               ActiveSupport::Logger.new($stderr)
             end
         logger.warn message
diff --git a/activesupport/lib/active_support/deprecation/constant_accessor.rb b/activesupport/lib/active_support/deprecation/constant_accessor.rb
index 0dfd96d134..3d7eedf637 100644
--- a/activesupport/lib/active_support/deprecation/constant_accessor.rb
+++ b/activesupport/lib/active_support/deprecation/constant_accessor.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "../inflector/methods"
+require "active_support/inflector/methods"
 
 module ActiveSupport
   class Deprecation
diff --git a/activesupport/lib/active_support/deprecation/instance_delegator.rb b/activesupport/lib/active_support/deprecation/instance_delegator.rb
index 539357c83e..8beda373a2 100644
--- a/activesupport/lib/active_support/deprecation/instance_delegator.rb
+++ b/activesupport/lib/active_support/deprecation/instance_delegator.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative "../core_ext/kernel/singleton_class"
-require_relative "../core_ext/module/delegation"
+require "active_support/core_ext/kernel/singleton_class"
+require "active_support/core_ext/module/delegation"
 
 module ActiveSupport
   class Deprecation
diff --git a/activesupport/lib/active_support/deprecation/method_wrappers.rb b/activesupport/lib/active_support/deprecation/method_wrappers.rb
index 8c942ed9a5..d359992bf5 100644
--- a/activesupport/lib/active_support/deprecation/method_wrappers.rb
+++ b/activesupport/lib/active_support/deprecation/method_wrappers.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative "../core_ext/module/aliasing"
-require_relative "../core_ext/array/extract_options"
+require "active_support/core_ext/module/aliasing"
+require "active_support/core_ext/array/extract_options"
 
 module ActiveSupport
   class Deprecation
diff --git a/activesupport/lib/active_support/deprecation/proxy_wrappers.rb b/activesupport/lib/active_support/deprecation/proxy_wrappers.rb
index 1920d75faf..f6c6648917 100644
--- a/activesupport/lib/active_support/deprecation/proxy_wrappers.rb
+++ b/activesupport/lib/active_support/deprecation/proxy_wrappers.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative "../inflector/methods"
-require_relative "../core_ext/regexp"
+require "active_support/inflector/methods"
+require "active_support/core_ext/regexp"
 
 module ActiveSupport
   class Deprecation
-- 
cgit v1.2.3