From 1893313c4025bdfa0a348efecc1a9e89cfa5fb1c Mon Sep 17 00:00:00 2001
From: Maikel Linke <maikel@email.org.au>
Date: Thu, 15 Apr 2021 12:22:28 +1000
Subject: [PATCH] Confine DelegateBelongsTo patch to our app

---
 app/models/application_record.rb      | 2 ++
 lib/spree/core/delegate_belongs_to.rb | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/application_record.rb b/app/models/application_record.rb
index 71fbba5b32..6af72b36ba 100644
--- a/app/models/application_record.rb
+++ b/app/models/application_record.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
 class ApplicationRecord < ActiveRecord::Base
+  include DelegateBelongsTo
+
   self.abstract_class = true
 end
diff --git a/lib/spree/core/delegate_belongs_to.rb b/lib/spree/core/delegate_belongs_to.rb
index 6c96134b1e..f2e4fda770 100644
--- a/lib/spree/core/delegate_belongs_to.rb
+++ b/lib/spree/core/delegate_belongs_to.rb
@@ -90,5 +90,3 @@ module DelegateBelongsTo
   end
   protected :delegator_for
 end
-
-ActiveRecord::Base.include(DelegateBelongsTo)