From a9e3143c19a026d1beb232790b67f064689769b6 Mon Sep 17 00:00:00 2001
From: Nicholas Shook <nshook@q-centrix.com>
Date: Thu, 17 Sep 2015 11:55:23 -0700
Subject: [PATCH 1/5] add require statements to top of file

Based on
https://github.com/rails-api/active_model_serializers/issues/1170#issuecomment-141184047
---
 lib/active_model/serializer.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/active_model/serializer.rb b/lib/active_model/serializer.rb
index 6e00c2db..5fae89bc 100644
--- a/lib/active_model/serializer.rb
+++ b/lib/active_model/serializer.rb
@@ -1,4 +1,6 @@
 require 'thread_safe'
+require_relative 'serializer/configuration'
+require_relative 'serializer/associations'
 
 module ActiveModel
   class Serializer

From 6bdb4a13e242f1285f9be732dc01f369fc60ae6b Mon Sep 17 00:00:00 2001
From: Nicholas Shook <nshook@q-centrix.com>
Date: Thu, 17 Sep 2015 11:59:38 -0700
Subject: [PATCH 2/5] removed autoload statements

---
 lib/active_model/serializer.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/active_model/serializer.rb b/lib/active_model/serializer.rb
index 5fae89bc..0a646dd6 100644
--- a/lib/active_model/serializer.rb
+++ b/lib/active_model/serializer.rb
@@ -6,11 +6,9 @@ module ActiveModel
   class Serializer
     extend ActiveSupport::Autoload
 
-    autoload :Configuration
     autoload :ArraySerializer
     autoload :Adapter
     autoload :Lint
-    autoload :Associations
     autoload :Fieldset
     autoload :Utils
     include Configuration

From faa56482d156f2617b40eccf60b349e1d7f757e5 Mon Sep 17 00:00:00 2001
From: Nicholas Shook <nshook@q-centrix.com>
Date: Thu, 17 Sep 2015 12:35:41 -0700
Subject: [PATCH 3/5] full require

---
 lib/active_model/serializer.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/active_model/serializer.rb b/lib/active_model/serializer.rb
index 0a646dd6..6c3a5ee3 100644
--- a/lib/active_model/serializer.rb
+++ b/lib/active_model/serializer.rb
@@ -1,6 +1,6 @@
 require 'thread_safe'
-require_relative 'serializer/configuration'
-require_relative 'serializer/associations'
+require 'active_model/serializer/configuration'
+require 'active_model/serializer/associations'
 
 module ActiveModel
   class Serializer

From 444b4cd1d8e2b36799b411ba530895eb6a115cb0 Mon Sep 17 00:00:00 2001
From: Nicholas Shook <nshook@q-centrix.com>
Date: Thu, 17 Sep 2015 13:44:40 -0700
Subject: [PATCH 4/5] all require

---
 lib/active_model/serializer.rb | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/lib/active_model/serializer.rb b/lib/active_model/serializer.rb
index 6c3a5ee3..58e57f04 100644
--- a/lib/active_model/serializer.rb
+++ b/lib/active_model/serializer.rb
@@ -1,16 +1,14 @@
 require 'thread_safe'
-require 'active_model/serializer/configuration'
+require 'active_model/serializer/adapter'
+require 'active_model/serializer/array_serializer'
 require 'active_model/serializer/associations'
+require 'active_model/serializer/configuration'
+require 'active_model/serializer/fieldset'
+require 'active_model/serializer/lint'
+require 'active_model/serializer/utils'
 
 module ActiveModel
   class Serializer
-    extend ActiveSupport::Autoload
-
-    autoload :ArraySerializer
-    autoload :Adapter
-    autoload :Lint
-    autoload :Fieldset
-    autoload :Utils
     include Configuration
     include Associations
 

From 7f17ec8afa8915add8220c4ccd51eba8ccbb8b32 Mon Sep 17 00:00:00 2001
From: Nicholas Shook <nshook@q-centrix.com>
Date: Thu, 17 Sep 2015 22:03:22 -0700
Subject: [PATCH 5/5] bring back autoload - fix test

---
 lib/active_model/serializer.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/active_model/serializer.rb b/lib/active_model/serializer.rb
index 58e57f04..5458a522 100644
--- a/lib/active_model/serializer.rb
+++ b/lib/active_model/serializer.rb
@@ -9,6 +9,8 @@ require 'active_model/serializer/utils'
 
 module ActiveModel
   class Serializer
+    extend ActiveSupport::Autoload
+
     include Configuration
     include Associations