Merge revert-154-revert-147-rails7 into staging

CruGlobal · Jan 2, 2024 · 2148ae1 · 2148ae1
2 parents 5801ff9 + 5a1caf5
commit 2148ae1
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -61,7 +61,7 @@ GEM
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
     active_material (1.5.2)
-    activeadmin (3.1.0)
+    activeadmin (3.2.0)
       arbre (~> 1.2, >= 1.2.1)
       formtastic (>= 3.1)
       formtastic_i18n (>= 0.4)
@@ -281,7 +281,7 @@ GEM
       net-protocol
     netrc (0.11.0)
     nio4r (2.5.9)
-    nokogiri (1.15.5)
+    nokogiri (1.16.0)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     oauth2 (2.0.9)