From 7f73222109fac05a302b39d76b942bc499b15add Mon Sep 17 00:00:00 2001
From: Eric Larson <ewlarson@gmail.com>
Date: Mon, 16 Dec 2024 14:10:04 -0600
Subject: [PATCH] Gems: bump GBL Admin bug fix

---
 Gemfile      |  4 +--
 Gemfile.lock | 76 ++++++++++++++++++++++++++++------------------------
 2 files changed, 43 insertions(+), 37 deletions(-)

diff --git a/Gemfile b/Gemfile
index 971dd5b31..5797990fb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -82,7 +82,7 @@ gem 'twitter-typeahead-rails', '0.11.1.pre.corejavascript'
 gem 'geoblacklight', '4.4'
 
 # GBL Admin
-gem 'geoblacklight_admin', "~> 0.6.0"
+gem 'geoblacklight_admin', git: "https://github.com/geobtaa/geoblacklight_admin.git", branch: "feature/btaa-migration-fix"
 gem 'git', ">= 1.13"
 gem "rubyzip", ">= 1.3.0"
 gem "awesome_print"
@@ -104,7 +104,7 @@ gem 'geoblacklight_sidecar_images', git: "https://github.com/geoblacklight/geobl
 gem 'mini_magick', '~> 4.9.4'
 gem "image_processing", ">= 1.2"
 
-gem 'statesman', '>= 12.0'
+gem 'statesman', '~> 12.0'
 gem 'sidekiq', '~> 6.4'
 gem 'sidekiq-failures', '~> 1.0.0'
 gem 'down', '~> 5.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 8aa5987ed..8ccf815f8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -41,6 +41,45 @@ GIT
       rails (>= 5.2, < 8.0)
       statesman (>= 3.4)
 
+GIT
+  remote: https://github.com/geobtaa/geoblacklight_admin.git
+  revision: ceccb7a8c0db77151ef3f92f994ec85847766cd7
+  branch: feature/btaa-migration-fix
+  specs:
+    geoblacklight_admin (0.6.1)
+      active_storage_validations (~> 1.0)
+      amazing_print
+      blacklight (~> 7.33)
+      blacklight_advanced_search
+      blacklight_range_limit
+      bootstrap (~> 4.0)
+      chosen-rails (~> 1.10)
+      cocoon (~> 1.2)
+      config (~> 4.0)
+      devise (~> 4.7)
+      devise-bootstrap-views (~> 1.0)
+      dotenv-rails (~> 2.8)
+      geoblacklight (~> 4.4)
+      haml (~> 5.2)
+      httparty (~> 0.21)
+      inline_svg (~> 1.9)
+      jquery-rails (~> 4.4)
+      kithe (~> 2.0)
+      mutex_m (~> 0.2.0)
+      noticed (~> 1.6)
+      pagy (~> 6.0)
+      paper_trail (~> 15.0)
+      pg (~> 1.4)
+      qa (~> 5.0)
+      rails (~> 7.0, < 7.3)
+      ruby-progressbar
+      simple_form (~> 5.0)
+      sprockets (~> 3.0)
+      statesman (~> 12.0)
+      vite_rails (~> 3.0)
+      vite_ruby (>= 3.5)
+      zeitwerk (~> 2.6)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -365,39 +404,6 @@ GEM
       rgeo-geojson
       sprockets-rails (~> 3.0)
       vite_rails (~> 3.0)
-    geoblacklight_admin (0.6.1)
-      active_storage_validations (~> 1.0)
-      amazing_print
-      blacklight (~> 7.33)
-      blacklight_advanced_search
-      blacklight_range_limit
-      bootstrap (~> 4.0)
-      chosen-rails (~> 1.10)
-      cocoon (~> 1.2)
-      config (~> 4.0)
-      devise (~> 4.7)
-      devise-bootstrap-views (~> 1.0)
-      dotenv-rails (~> 2.8)
-      geoblacklight (~> 4.4)
-      haml (~> 5.2)
-      httparty (~> 0.21)
-      inline_svg (~> 1.9)
-      jquery-rails (~> 4.4)
-      kithe (~> 2.0)
-      mutex_m (~> 0.2.0)
-      noticed (~> 1.6)
-      pagy (~> 6.0)
-      paper_trail (~> 15.0)
-      pg (~> 1.4)
-      qa (~> 5.0)
-      rails (~> 7.0, < 7.3)
-      ruby-progressbar
-      simple_form (~> 5.0)
-      sprockets (~> 3.0)
-      statesman (~> 12.0)
-      vite_rails (~> 3.0)
-      vite_ruby (>= 3.5)
-      zeitwerk (~> 2.6)
     geocoder (1.8.4)
       base64 (>= 0.1.0)
       csv (>= 3.0.0)
@@ -878,7 +884,7 @@ DEPENDENCIES
   foreman
   geoblacklight (= 4.4)
   geoblacklight-icons!
-  geoblacklight_admin (~> 0.6.0)
+  geoblacklight_admin!
   geoblacklight_sidecar_images!
   git (>= 1.13)
   haml
@@ -922,7 +928,7 @@ DEPENDENCIES
   spring
   sqlite3 (~> 1.4)
   stackprof (~> 0.2.12)
-  statesman (>= 12.0)
+  statesman (~> 12.0)
   stimulus-rails
   terser
   turbolinks