Merge branch 'main' into dependabot/bundler/faraday-2.14.1

Author: benjaminmoon

Gemfile.lock

@@ -1,29 +1,40 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.7.5)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+    activesupport (7.2.3.1)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+      logger (>= 1.4.2)
+      minitest (>= 5.1, < 6)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+    addressable (2.9.0)
+      public_suffix (>= 2.0.2, < 8.0)
     algolia_html_extractor (2.6.4)
       json (~> 2.0)
       nokogiri (~> 1.10)
     algoliasearch (1.27.5)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
+    base64 (0.3.0)
+    benchmark (0.5.0)
+    bigdecimal (4.0.1)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
     coffee-script-source (1.11.1)
     colorator (1.1.0)
     commonmarker (0.23.11)
-    concurrent-ruby (1.3.5)
+    concurrent-ruby (1.3.6)
+    connection_pool (3.0.2)
     dnsruby (1.61.5)
       simpleidn (~> 0.1)
+    drb (2.2.3)
     em-websocket (0.5.2)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
@@ -97,7 +108,7 @@ GEM
       nokogiri (>= 1.4)
     http_parser.rb (0.6.0)
     httpclient (2.8.3)
-    i18n (1.14.7)
+    i18n (1.14.8)
       concurrent-ruby (~> 1.0)
     jekyll (3.9.3)
       addressable (~> 2.4)
@@ -239,9 +250,14 @@ GEM
       jekyll-include-cache (~> 0.1)
       jekyll-paginate (~> 1.1)
       jekyll-sitemap (~> 1.3)
+<<<<<<< dependabot/bundler/faraday-2.14.1
     minitest (5.25.5)
     net-http (0.9.1)
       uri (>= 0.11.1)
+=======
+    minitest (5.27.0)
+    multipart-post (2.1.1)
+>>>>>>> main
     nokogiri (1.18.9)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
@@ -251,12 +267,12 @@ GEM
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
     progressbar (1.11.0)
-    public_suffix (4.0.6)
+    public_suffix (4.0.7)
     racc (1.8.1)
     rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rexml (3.3.9)
+    rexml (3.4.2)
     rouge (3.26.0)
     rubyzip (2.3.0)
     safe_yaml (1.0.5)
@@ -267,7 +283,12 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.7)
     sawyer (0.9.3)
       addressable (>= 2.3.5)
+<<<<<<< dependabot/bundler/faraday-2.14.1
       faraday (>= 0.17.3, < 3)
+=======
+      faraday (> 0.8, < 2.0)
+    securerandom (0.4.1)
+>>>>>>> main
     simpleidn (0.2.1)
       unf (~> 0.1.4)
     terminal-table (1.8.0)
@@ -285,7 +306,6 @@ GEM
     uri (1.1.1)
     verbal_expressions (0.1.5)
     webrick (1.8.2)
-    zeitwerk (2.7.3)
 
 PLATFORMS
   ruby