From bb6551471a00fe1c3a444ff161c9f2642bcf6df9 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Fri, 20 Dec 2024 10:26:47 +0000
Subject: [PATCH] Use rails 8 compatible active_record_union

https://github.com/brianhempel/active_record_union/issues/36
---
 Gemfile      |  2 +-
 Gemfile.lock | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 4d934cd5478..1ec5c79132b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -49,7 +49,7 @@ gem "file_exists"
 # Load rails plugins
 gem "actionpack-page_caching", ">= 1.2.0"
 gem "activerecord-import"
-gem "active_record_union"
+gem "active_record_union", :github => "brianhempel/active_record_union", :ref => "master"
 gem "bootstrap", "~> 5.3.2"
 gem "bootstrap_form", "~> 5.0"
 gem "cancancan"
diff --git a/Gemfile.lock b/Gemfile.lock
index cfb1d10434e..2bb86cb9a88 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,11 @@
+GIT
+  remote: https://github.com/brianhempel/active_record_union.git
+  revision: 8ebe558709aabe039abd24e3e7dd4d4354a6de88
+  ref: master
+  specs:
+    active_record_union (1.3.0)
+      activerecord (>= 6.0)
+
 GIT
   remote: https://github.com/kolide/canonical-rails.git
   revision: 09b093de055fb4bbf2f33525a01896377a4b1adf
@@ -56,8 +64,6 @@ GEM
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    active_record_union (1.3.0)
-      activerecord (>= 4.0)
     activejob (8.0.1)
       activesupport (= 8.0.1)
       globalid (>= 0.3.6)
@@ -670,7 +676,7 @@ PLATFORMS
 DEPENDENCIES
   aasm
   actionpack-page_caching (>= 1.2.0)
-  active_record_union
+  active_record_union!
   activerecord-import
   addressable (~> 2.8)
   annotate