Merge branch 'release/5.12.0'

geobtaa · Dec 16, 2024 · e179627 · e179627
2 parents c3c24b2 + fefbfe6
commit e179627
Show file tree

Hide file tree

Showing 31 changed files with 977 additions and 461 deletions.
diff --git a/.gitignore b/.gitignore
@@ -61,3 +61,4 @@ node_modules
 # Vite uses dotenv and suggests to ignore local-only env files. See
 # https://vitejs.dev/guide/env-and-mode.html#env-files
 *.local
+db/gazetteer/*
diff --git 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', git: "https://github.com/geobtaa/geoblacklight_admin.git", branch: "develop"
+gem 'geoblacklight_admin', "~> 0.6.0"
 gem 'git', ">= 1.13"
 gem "rubyzip", ">= 1.3.0"
 gem "awesome_print"
@@ -100,11 +100,11 @@ gem 'noticed'
 gem 'paper_trail'
 
 # Image migration
-gem 'geoblacklight_sidecar_images', git: "https://github.com/geoblacklight/geoblacklight_sidecar_images.git", branch: "feature/statesman-update"
+gem 'geoblacklight_sidecar_images', git: "https://github.com/geoblacklight/geoblacklight_sidecar_images.git", branch: "develop"
 gem 'mini_magick', '~> 4.9.4'
 gem "image_processing", ">= 1.2"
 
-gem 'statesman', '~> 10.0'
+gem 'statesman', '>= 12.0'
 gem 'sidekiq', '~> 6.4'
 gem 'sidekiq-failures', '~> 1.0.0'
 gem 'down', '~> 5.0'