From 8c2ba84d6301b429bd6d68d7b8fd24f86926dabd Mon Sep 17 00:00:00 2001
From: Akira Matsuda <ronnie@dio.jp>
Date: Sat, 21 Oct 2017 22:15:16 +0900
Subject: [PATCH] [Active Model] require => require_relative

This basically reverts ee5cfc01a5797f854c8441539b0cae326a81b963
---
 activemodel/lib/active_model.rb               |  2 +-
 activemodel/lib/active_model/type.rb          | 28 +++++++++----------
 .../lib/active_model/type/big_integer.rb      |  2 +-
 activemodel/lib/active_model/type/helpers.rb  |  8 +++---
 activemodel/lib/active_model/type/string.rb   |  2 +-
 .../lib/active_model/validations/exclusion.rb |  2 +-
 .../lib/active_model/validations/inclusion.rb |  2 +-
 7 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/activemodel/lib/active_model.rb b/activemodel/lib/active_model.rb
index dfd9be34a9..a97d7989be 100644
--- a/activemodel/lib/active_model.rb
+++ b/activemodel/lib/active_model.rb
@@ -25,7 +25,7 @@
 
 require "active_support"
 require "active_support/rails"
-require_relative "active_model/version"
+require "active_model/version"
 
 module ActiveModel
   extend ActiveSupport::Autoload
diff --git a/activemodel/lib/active_model/type.rb b/activemodel/lib/active_model/type.rb
index cb603b3d25..b0ed67f28e 100644
--- a/activemodel/lib/active_model/type.rb
+++ b/activemodel/lib/active_model/type.rb
@@ -1,21 +1,21 @@
 # frozen_string_literal: true
 
-require_relative "type/helpers"
-require_relative "type/value"
+require "active_model/type/helpers"
+require "active_model/type/value"
 
-require_relative "type/big_integer"
-require_relative "type/binary"
-require_relative "type/boolean"
-require_relative "type/date"
-require_relative "type/date_time"
-require_relative "type/decimal"
-require_relative "type/float"
-require_relative "type/immutable_string"
-require_relative "type/integer"
-require_relative "type/string"
-require_relative "type/time"
+require "active_model/type/big_integer"
+require "active_model/type/binary"
+require "active_model/type/boolean"
+require "active_model/type/date"
+require "active_model/type/date_time"
+require "active_model/type/decimal"
+require "active_model/type/float"
+require "active_model/type/immutable_string"
+require "active_model/type/integer"
+require "active_model/type/string"
+require "active_model/type/time"
 
-require_relative "type/registry"
+require "active_model/type/registry"
 
 module ActiveModel
   module Type
diff --git a/activemodel/lib/active_model/type/big_integer.rb b/activemodel/lib/active_model/type/big_integer.rb
index d080fcc0f2..89e43bcc5f 100644
--- a/activemodel/lib/active_model/type/big_integer.rb
+++ b/activemodel/lib/active_model/type/big_integer.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "integer"
+require "active_model/type/integer"
 
 module ActiveModel
   module Type
diff --git a/activemodel/lib/active_model/type/helpers.rb b/activemodel/lib/active_model/type/helpers.rb
index a4e1427b64..403f0a9e6b 100644
--- a/activemodel/lib/active_model/type/helpers.rb
+++ b/activemodel/lib/active_model/type/helpers.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "helpers/accepts_multiparameter_time"
-require_relative "helpers/numeric"
-require_relative "helpers/mutable"
-require_relative "helpers/time_value"
+require "active_model/type/helpers/accepts_multiparameter_time"
+require "active_model/type/helpers/numeric"
+require "active_model/type/helpers/mutable"
+require "active_model/type/helpers/time_value"
diff --git a/activemodel/lib/active_model/type/string.rb b/activemodel/lib/active_model/type/string.rb
index 6ba2c2a3d2..36f13945b1 100644
--- a/activemodel/lib/active_model/type/string.rb
+++ b/activemodel/lib/active_model/type/string.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "immutable_string"
+require "active_model/type/immutable_string"
 
 module ActiveModel
   module Type
diff --git a/activemodel/lib/active_model/validations/exclusion.rb b/activemodel/lib/active_model/validations/exclusion.rb
index a6cbfcc813..3be7ab6ba8 100644
--- a/activemodel/lib/active_model/validations/exclusion.rb
+++ b/activemodel/lib/active_model/validations/exclusion.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "clusivity"
+require "active_model/validations/clusivity"
 
 module ActiveModel
   module Validations
diff --git a/activemodel/lib/active_model/validations/inclusion.rb b/activemodel/lib/active_model/validations/inclusion.rb
index 00e27b528a..3104e7e329 100644
--- a/activemodel/lib/active_model/validations/inclusion.rb
+++ b/activemodel/lib/active_model/validations/inclusion.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "clusivity"
+require "active_model/validations/clusivity"
 
 module ActiveModel
   module Validations