From 143ecf1cc2f117ed591b992c7f44df2ab8111ea2 Mon Sep 17 00:00:00 2001
From: baarkerlounger <5101747+baarkerlounger@users.noreply.github.com>
Date: Thu, 20 Jan 2022 12:17:10 +0000
Subject: [PATCH] Inherited resources release is rails 7 compatible now (#232)

---
 Gemfile      |  1 -
 Gemfile.lock | 20 +++++++-------------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/Gemfile b/Gemfile
index 2f7253136..7084e1e3e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -26,7 +26,6 @@ gem "discard"
 # Administration framework
 gem "activeadmin", git: "https://github.com/tagliala/activeadmin.git", branch: "feature/railties-7"
 gem "arbre", github: "activeadmin/arbre"
-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 97d6b74ab..94ac93f33 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -6,16 +6,6 @@ GIT
       activesupport (>= 3.0.0, < 7.1)
       ruby2_keywords (>= 0.0.2, < 1.0)
 
-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/devise.git
   revision: 0f585ea6683a06858863597628b48610731c2613
@@ -30,7 +20,7 @@ GIT
 
 GIT
   remote: https://github.com/tagliala/activeadmin.git
-  revision: 12ef798e1a02084565fa2ea698e26334dbc56e42
+  revision: 8ccc35b8144482284c90b0af74a01e940765f7a6
   branch: feature/railties-7
   specs:
     activeadmin (2.9.0)
@@ -183,6 +173,11 @@ GEM
       turbo-rails
     i18n (1.8.11)
       concurrent-ruby (~> 1.0)
+    inherited_resources (1.13.1)
+      actionpack (>= 5.2, < 7.1)
+      has_scope (~> 0.6)
+      railties (>= 5.2, < 7.1)
+      responders (>= 2, < 4)
     iniparse (1.5.0)
     io-wait (0.2.1)
     jquery-rails (4.4.0)
@@ -216,7 +211,7 @@ GEM
     method_source (1.0.0)
     mini_mime (1.1.2)
     minitest (5.15.0)
-    msgpack (1.4.2)
+    msgpack (1.4.3)
     net-imap (0.2.3)
       digest
       net-protocol
@@ -438,7 +433,6 @@ DEPENDENCIES
   govuk-components
   govuk_design_system_formbuilder
   hotwire-rails
-  inherited_resources!
   json-schema
   listen (~> 3.3)
   overcommit (>= 0.37.0)