Merge pull request #24 from benjaminmoon/dependabot/bundler/faraday-2.14.1

Bump faraday from 0.17.3 to 2.14.1

Author: benjaminmoon

Gemfile

@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 gem "github-pages", group: :jekyll_plugins
-gem "faraday", "0.17.3"
+gem "faraday", "2.14.1"
 
 # remediation CVE-2020-14001
 gem "kramdown", ">= 2.3.0"

Gemfile.lock

@@ -42,8 +42,12 @@ GEM
       ffi (>= 1.15.0)
     eventmachine (1.2.7)
     execjs (2.7.0)
-    faraday (0.17.3)
-      multipart-post (>= 1.2, < 3)
+    faraday (2.14.1)
+      faraday-net_http (>= 2.0, < 3.5)
+      json
+      logger
+    faraday-net_http (3.4.2)
+      net-http (~> 0.5)
     ffi (1.15.0)
     filesize (0.2.0)
     forwardable-extended (2.6.0)
@@ -246,14 +250,20 @@ 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)
-    octokit (4.20.0)
-      faraday (>= 0.9)
-      sawyer (~> 0.8.0, >= 0.5.3)
+    octokit (4.25.1)
+      faraday (>= 1, < 3)
+      sawyer (~> 0.9)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
     progressbar (1.11.0)
@@ -271,10 +281,14 @@ GEM
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    sawyer (0.8.2)
+    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)
@@ -289,6 +303,7 @@ GEM
       unf_ext
     unf_ext (0.0.7.7)
     unicode-display_width (1.7.0)
+    uri (1.1.1)
     verbal_expressions (0.1.5)
     webrick (1.8.2)
 
@@ -297,7 +312,7 @@ PLATFORMS
 
 DEPENDENCIES
   activesupport (>= 6.0.3.1)
-  faraday (= 0.17.3)
+  faraday (= 2.14.1)
   github-pages
   jekyll-algolia
   jekyll-feed