1 files changed, 15 insertions, 2 deletions
diff --git a/config/initializers/active_record_preloader.rb b/config/initializers/active_record_preloader.rb
index 3b16014f302..a293909149e 100644
--- a/config/initializers/active_record_preloader.rb
+++ b/config/initializers/active_record_preloader.rb
@@ -1,9 +1,22 @@
 module ActiveRecord
   module Associations
     class Preloader
+      class NullPreloader
+        def self.new(klass, owners, reflection, preload_scope)
+          self
+        end
+
+        def self.run(preloader)
+        end
+
+        def self.preloaded_records
+          []
+        end
+      end
+
       module NoCommitPreloader
-        def preloader_for(reflection, owners, rhs_klass)
-          return NullPreloader if rhs_klass == ::Commit
+        def preloader_for(reflection, owners)
+          return NullPreloader if owners.first.association(reflection.name).klass == ::Commit
 
           super
         end