From d09621c354d381c8a380a8c97444f21532205a33 Mon Sep 17 00:00:00 2001 From: Tom Hughes 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 b5c090204f..39e56cc2e6 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 6dcb988a36..8098543eba 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) + GEM remote: https://rubygems.org/ specs: @@ -48,8 +56,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) @@ -669,7 +675,7 @@ PLATFORMS DEPENDENCIES aasm actionpack-page_caching (>= 1.2.0) - active_record_union + active_record_union! activerecord-import addressable (~> 2.8) annotate