From f9c74c1e60fd45ddd840af43cd08364e770ed40c Mon Sep 17 00:00:00 2001
From: zinduolis <ilgakulnis@gmail.com>
Date: Thu, 10 Oct 2024 09:14:53 +1000
Subject: [PATCH] Revert otr-activerecord from 2.4.0 back to 2.2.0 to fix
 broken activerecord reference

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

diff --git a/Gemfile b/Gemfile
index b232c53035..76355a0586 100644
--- a/Gemfile
+++ b/Gemfile
@@ -21,7 +21,7 @@ gem 'term-ansicolor', :require => 'term/ansicolor'
 gem 'rubyzip', '~> 2.3'
 gem 'espeak-ruby', '~> 1.1.0' # Text-to-Voice
 gem 'rake', '~> 13.2'
-gem 'otr-activerecord', '~> 2.4.0'
+gem 'otr-activerecord', '~> 2.2.0'
 gem 'sqlite3', '~> 1.4'
 gem 'rubocop', '~> 1.66.1', require: false
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 5f079519a2..cff2b4240a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -99,7 +99,7 @@ GEM
     mojo_magick (0.6.8)
     msfrpc-client (1.1.2)
       msgpack (~> 1)
-    msgpack (1.7.2)
+    msgpack (1.7.3)
     mustermann (3.0.3)
       ruby2_keywords (~> 0.0.1)
     mutex_m (0.2.0)
@@ -121,15 +121,15 @@ GEM
       racc (~> 1.4)
     nokogiri (1.16.7-x86_64-linux)
       racc (~> 1.4)
-    otr-activerecord (2.4.0)
-      activerecord (>= 6.0, < 7.3)
+    otr-activerecord (2.2.0)
+      activerecord (>= 4.0, < 7.2)
       hashie-forbidden_attributes (~> 0.1)
     parallel (1.26.3)
     parseconfig (1.1.2)
     parser (3.3.5.0)
       ast (~> 2.4.1)
       racc
-    power_assert (2.0.3)
+    power_assert (2.0.4)
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -173,7 +173,7 @@ GEM
     rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.1)
+    rspec-mocks (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.1)
@@ -241,7 +241,7 @@ GEM
     tilt (2.4.0)
     timeout (0.4.1)
     timers (4.3.5)
-    tins (1.33.0)
+    tins (1.34.0)
       bigdecimal
       sync
     tzinfo (2.0.6)
@@ -286,7 +286,7 @@ DEPENDENCIES
   mime-types (~> 3.6)
   msfrpc-client (~> 1.1, >= 1.1.2)
   net-smtp
-  otr-activerecord (~> 2.4.0)
+  otr-activerecord (~> 2.2.0)
   parseconfig (~> 1.1, >= 1.1.2)
   pry-byebug (~> 3.10, >= 3.10.1)
   qr4r (~> 0.6.1)