From fd30790dccc0a4a987b774a166400954b947c133 Mon Sep 17 00:00:00 2001
From: baarkerlounger <db@slothlife.xyz>
Date: Mon, 27 Dec 2021 13:47:49 +0000
Subject: [PATCH] Inherited resources master

---
 Gemfile      |  2 +-
 Gemfile.lock | 23 +++++++++++------------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/Gemfile b/Gemfile
index 24578650d..318f93bfc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -25,7 +25,7 @@ gem "hotwire-rails"
 gem "discard"
 # Administration framework
 gem "activeadmin", git: "https://github.com/baarkerlounger/activeadmin.git", branch: "rails7"
-gem "inherited_resources", git: "https://github.com/naveed-ahmad/inherited_resources.git", branch: "rails7"
+gem "inherited_resources", git: "https://github.com/activeadmin/inherited_resources.git"
 # Admin charts
 gem "chartkick"
 # Spreadsheet parsing
diff --git a/Gemfile.lock b/Gemfile.lock
index e4c2c782c..8fd0c5049 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,13 @@
+GIT
+  remote: https://github.com/activeadmin/inherited_resources.git
+  revision: a0a350245a2ec76c040f8751707c1d98792534dd
+  specs:
+    inherited_resources (1.13.0)
+      actionpack (>= 5.2, < 7.1)
+      has_scope (~> 0.6)
+      railties (>= 5.2, < 7.1)
+      responders (>= 2, < 4)
+
 GIT
   remote: https://github.com/baarkerlounger/activeadmin.git
   revision: 8274b3dcf6f2ddd8190eeb5e3ee618706214fa2d
@@ -25,17 +35,6 @@ GIT
       responders
       warden (~> 1.2.3)
 
-GIT
-  remote: https://github.com/naveed-ahmad/inherited_resources.git
-  revision: 15aa6273f97cc34369a080b82e7b9e15c4308c00
-  branch: rails7
-  specs:
-    inherited_resources (1.13.0)
-      actionpack (>= 5.2, <= 7.0.0)
-      has_scope (~> 0.6)
-      railties (>= 5.2, <= 7.0.0)
-      responders (>= 2, < 4)
-
 GIT
   remote: https://github.com/rspec/rspec-core.git
   revision: e3bda9da1e625a428fd005f0d1a633531f5da749
@@ -414,7 +413,7 @@ GEM
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.5.1)
+    zeitwerk (2.5.2)
 
 PLATFORMS
   arm64-darwin-21