From a9ec75c9b0b7977cda344a1ef0e84499eaf54144 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Fri, 20 Dec 2024 17:33:25 +0000
Subject: [PATCH] Use rails 8 compatible annotate gem

---
 Gemfile      |  2 +-
 Gemfile.lock | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 1ec5c79132..bdf141e434 100644
--- a/Gemfile
+++ b/Gemfile
@@ -182,7 +182,7 @@ group :test do
 end
 
 group :development, :test do
-  gem "annotate"
+  gem "annotate", :github => "andynu/annotate_models", :ref => "rails-8-0"
   gem "teaspoon"
   gem "teaspoon-mocha", "~> 2.3.3"
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 2bb86cb9a8..b28b35e5ed 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,12 @@
+GIT
+  remote: https://github.com/andynu/annotate_models.git
+  revision: 2c72ee8995ae8c1b9f5cf8690e8e3d22b7bd080d
+  ref: rails-8-0
+  specs:
+    annotate (3.2.0)
+      activerecord (>= 3.2, < 9.0)
+      rake (>= 10.4, < 14.0)
+
 GIT
   remote: https://github.com/brianhempel/active_record_union.git
   revision: 8ebe558709aabe039abd24e3e7dd4d4354a6de88
@@ -96,9 +105,6 @@ GEM
       uri (>= 0.13.1)
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
-    annotate (2.6.5)
-      activerecord (>= 2.3.0)
-      rake (>= 0.8.7)
     argon2 (2.3.0)
       ffi (~> 1.15)
       ffi-compiler (~> 1.0)
@@ -679,7 +685,7 @@ DEPENDENCIES
   active_record_union!
   activerecord-import
   addressable (~> 2.8)
-  annotate
+  annotate!
   argon2
   autoprefixer-rails
   aws-sdk-s3