From ca85d1cd9e05a5981b5fd3f911dbd90816c36096 Mon Sep 17 00:00:00 2001
From: baarkerlounger <db@slothlife.xyz>
Date: Fri, 11 Mar 2022 19:46:20 +0000
Subject: [PATCH] Bump ActiveAdmin

---
 Gemfile      |  2 +-
 Gemfile.lock | 37 ++++++++++++++++---------------------
 2 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/Gemfile b/Gemfile
index bd8815fc1..9ce05d2b5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -24,7 +24,7 @@ gem "notifications-ruby-client"
 # Turbo and Stimulus
 gem "hotwire-rails"
 # Administration framework
-gem "activeadmin", github: "activeadmin/activeadmin"
+gem "activeadmin"
 # Admin charts
 gem "chartkick"
 # Spreadsheet parsing
diff --git a/Gemfile.lock b/Gemfile.lock
index 663c53061..1c5f83389 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,17 +1,3 @@
-GIT
-  remote: https://github.com/activeadmin/activeadmin.git
-  revision: 366f5e35a4e1fb319229651113d065205543d991
-  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
@@ -83,6 +69,15 @@ GEM
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activeadmin (2.11.0)
+      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)
     activejob (7.0.2.3)
       activesupport (= 7.0.2.3)
       globalid (>= 0.3.6)
@@ -110,8 +105,8 @@ GEM
       ruby2_keywords (>= 0.0.2, < 1.0)
     ast (2.4.2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.564.0)
-    aws-sdk-core (3.129.0)
+    aws-partitions (1.566.0)
+    aws-sdk-core (3.129.1)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
@@ -275,7 +270,7 @@ GEM
     parallel (1.21.0)
     parser (3.1.1.0)
       ast (~> 2.4.1)
-    pg (1.3.3)
+    pg (1.3.4)
     postcodes_io (0.4.0)
       excon (~> 0.39)
     pry (0.13.1)
@@ -326,9 +321,9 @@ GEM
     rainbow (3.1.1)
     rake (13.0.6)
     randexp (0.1.7)
-    ransack (2.5.0)
-      activerecord (>= 5.2.4)
-      activesupport (>= 5.2.4)
+    ransack (2.6.0)
+      activerecord (>= 6.0.4)
+      activesupport (>= 6.0.4)
       i18n
     rb-fsevent (0.11.1)
     rb-inotify (0.10.1)
@@ -468,7 +463,7 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  activeadmin!
+  activeadmin
   aws-sdk-s3
   bootsnap (>= 1.4.4)
   bundler-audit