From 4191555f2846ac6e6f353b29c7d48f9ef9261efb Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Thu, 2 Oct 2025 17:46:54 +0100 Subject: [PATCH] Switch back to using a released version of active_record_union --- Gemfile | 2 +- Gemfile.lock | 12 +++--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/Gemfile b/Gemfile index 029927e4b..57343c52d 100644 --- a/Gemfile +++ b/Gemfile @@ -47,7 +47,7 @@ gem "sprockets-exporters_pack" # Load rails plugins gem "actionpack-page_caching", ">= 1.2.0" gem "activerecord-import" -gem "active_record_union", :github => "brianhempel/active_record_union", :ref => "master" +gem "active_record_union" gem "bootstrap", "~> 5.3.2" gem "bootstrap_form", "~> 5.0" gem "cancancan" diff --git a/Gemfile.lock b/Gemfile.lock index 90281b8b3..b92722a4f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,11 +1,3 @@ -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/rkoeze/gd2-ffij.git revision: a203a8d5ef004a4198950e86329228fe3f331d06 @@ -64,6 +56,8 @@ GEM erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) + active_record_union (1.4.0) + activerecord (>= 6.0) activejob (8.0.3) activesupport (= 8.0.3) globalid (>= 0.3.6) @@ -887,7 +881,7 @@ PLATFORMS DEPENDENCIES aasm actionpack-page_caching (>= 1.2.0) - active_record_union! + active_record_union activerecord-import addressable (~> 2.8) annotaterb -- 2.39.5