From d4313cc05d6dc5eef49d132652350c66fbba6365 Mon Sep 17 00:00:00 2001
From: baarkerlounger <db@slothlife.xyz>
Date: Mon, 7 Mar 2022 18:32:58 +0000
Subject: [PATCH] Point active admin back to upstream main

---
 Gemfile      |  5 +++--
 Gemfile.lock | 39 +++++++++++++++++++--------------------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/Gemfile b/Gemfile
index dd418d067..57c72ca69 100644
--- a/Gemfile
+++ b/Gemfile
@@ -24,7 +24,7 @@ gem "notifications-ruby-client"
 # Turbo and Stimulus
 gem "hotwire-rails"
 # Administration framework
-gem "activeadmin", git: "https://github.com/tagliala/activeadmin.git", branch: "feature/railties-7"
+gem "activeadmin", github: "activeadmin/activeadmin"
 # Admin charts
 gem "chartkick"
 # Spreadsheet parsing
@@ -49,9 +49,10 @@ gem "aws-sdk-s3"
 gem "paper_trail"
 # Store active record objects in version whodunnits
 gem "paper_trail-globalid"
-# Receive exceptions and configure alerts
+# Request rate limiting
 gem "rack-attack"
 gem "redis"
+# Receive exceptions and configure alerts
 gem "sentry-rails"
 gem "sentry-ruby"
 
diff --git a/Gemfile.lock b/Gemfile.lock
index ee085ab03..1436927e9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,17 @@
+GIT
+  remote: https://github.com/activeadmin/activeadmin.git
+  revision: a8a90c8b79bb780eefe83ca7849a3389a5cd64a9
+  specs:
+    activeadmin (2.10.1)
+      arbre (~> 1.2, >= 1.2.1)
+      formtastic (>= 3.1, < 5.0)
+      formtastic_i18n (~> 0.4)
+      inherited_resources (~> 1.7)
+      jquery-rails (~> 4.2)
+      kaminari (~> 1.0, >= 1.2.1)
+      railties (>= 6.0, < 7.1)
+      ransack (~> 2.1, >= 2.1.1)
+
 GIT
   remote: https://github.com/baarkerlounger/devise.git
   revision: 9b93eff1be452683b9fed61ec8c350fbc8387e7f
@@ -21,21 +35,6 @@ GIT
       randexp
       rotp (>= 4.0.0)
 
-GIT
-  remote: https://github.com/tagliala/activeadmin.git
-  revision: 871c6af8dec41f764a9f08bf04b5422971a23e32
-  branch: feature/railties-7
-  specs:
-    activeadmin (2.10.1)
-      arbre (~> 1.2, >= 1.2.1)
-      formtastic (>= 3.1, < 5.0)
-      formtastic_i18n (~> 0.4)
-      inherited_resources (~> 1.7)
-      jquery-rails (~> 4.2)
-      kaminari (~> 1.0, >= 1.2.1)
-      railties (>= 6.0, < 7.1)
-      ransack (~> 2.1, >= 2.1.1)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -111,8 +110,8 @@ GEM
       ruby2_keywords (>= 0.0.2, < 1.0)
     ast (2.4.2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.562.0)
-    aws-sdk-core (3.127.0)
+    aws-partitions (1.563.0)
+    aws-sdk-core (3.128.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
@@ -354,7 +353,7 @@ GEM
     rspec-mocks (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
-    rspec-rails (5.1.0)
+    rspec-rails (5.1.1)
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       railties (>= 5.2)
@@ -380,7 +379,7 @@ GEM
       rubocop-rails (= 2.13.2)
       rubocop-rake (= 0.6.0)
       rubocop-rspec (= 2.7.0)
-    rubocop-performance (1.13.2)
+    rubocop-performance (1.13.3)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     rubocop-rails (2.13.2)
@@ -426,7 +425,7 @@ GEM
       railties (>= 6.0.0)
     strscan (3.0.1)
     thor (1.2.1)
-    timecop (0.9.4)
+    timecop (0.9.5)
     timeout (0.2.0)
     turbo-rails (1.0.1)
       actionpack (>= 6.0.0)