From 446de99b617c53798f19b1949c5a449eb8012ce9 Mon Sep 17 00:00:00 2001
From: Mike Dalessio <mike@37signals.com>
Date: Wed, 19 Mar 2025 17:20:18 -0400
Subject: [PATCH] dep: Update active_record-tenanted to the main branch

because all of our temporary branch hacks have been fixed there.
---
 Gemfile      | 2 +-
 Gemfile.lock | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 6e829a39d..19e7f2d5e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@ git_source(:bc) { |repo| "https://github.com/basecamp/#{repo}" }
 ruby file: ".ruby-version"
 
 gem "rails", github: "rails/rails", branch: "main"
-gem "active_record-tenanted", bc: "active_record-tenanted", branch: "fizzy-temporary-2"
+gem "active_record-tenanted", bc: "active_record-tenanted"
 
 # Assets & front end
 gem "importmap-rails"
diff --git a/Gemfile.lock b/Gemfile.lock
index 1c57a443a..78578218f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,6 @@
 GIT
   remote: https://github.com/basecamp/active_record-tenanted
-  revision: dcb9ee57eebfa85ed5a521c40266a0caaecc4a58
-  branch: fizzy-temporary-2
+  revision: 153da63088bbd30303baaaa7b724352b3a9cf83f
   specs:
     active_record-tenanted (0.1.0)
       activerecord (>= 8.1.alpha)