diff --git a/Gemfile b/Gemfile
index 827202593eaed..5e4130130b933 100644
--- a/Gemfile
+++ b/Gemfile
@@ -67,7 +67,7 @@ gem "omniauth-twitter", "~> 1.4" # OmniAuth strategy for Twitter
 gem "parallel", "~> 1.20" # Run any kind of code in parallel processes
 gem "patron", "~> 0.13.3" # HTTP client library based on libcurl, used with Elasticsearch to support http keep-alive connections
 gem "pg", "~> 1.2" # Pg is the Ruby interface to the PostgreSQL RDBMS
-gem "puma", "~> 5.1.1" # Puma is a simple, fast, threaded, and highly concurrent HTTP 1.1 server
+gem "puma", "~> 6.0.2" # Puma is a simple, fast, threaded, and highly concurrent HTTP 1.1 server
 gem "pundit", "~> 2.1" # Object oriented authorization for Rails applications
 gem "pusher", "~> 1.4" # Ruby library for Pusher Channels HTTP API
 gem "pusher-push-notifications", "~> 1.3" # Pusher Push Notifications Ruby server SDK
diff --git a/Gemfile.lock b/Gemfile.lock
index 0b96cbf2d2f57..63c4a92584bab 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -454,7 +454,7 @@ GEM
     mini_histogram (0.3.1)
     mini_magick (4.11.0)
     mini_mime (1.0.2)
-    mini_portile2 (2.5.0)
+    mini_portile2 (2.8.1)
     minitest (5.14.3)
     msgpack (1.3.3)
     multi_json (1.15.0)
@@ -464,13 +464,13 @@ GEM
     naught (1.1.0)
     nenv (0.3.0)
     netrc (0.11.0)
-    nio4r (2.5.4)
-    nokogiri (1.11.1)
-      mini_portile2 (~> 2.5.0)
+    nio4r (2.5.8)
+    nokogiri (1.13.10)
+      mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    nokogiri (1.11.1-x86_64-darwin)
+    nokogiri (1.13.10-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.11.1-x86_64-linux)
+    nokogiri (1.13.10-x86_64-linux)
       racc (~> 1.4)
     notiffany (0.1.3)
       nenv (~> 0.1)
@@ -521,7 +521,7 @@ GEM
     pry-rails (0.3.9)
       pry (>= 0.10.4)
     public_suffix (4.0.6)
-    puma (5.1.1)
+    puma (6.0.2)
       nio4r (~> 2.0)
     pundit (2.1.0)
       activesupport (>= 3.0.0)
@@ -537,7 +537,7 @@ GEM
       rest-client (~> 2.0, >= 2.0.2)
     pusher-signature (0.1.8)
     raabro (1.4.0)
-    racc (1.5.2)
+    racc (1.6.2)
     rack (2.2.3)
     rack-attack (6.4.0)
       rack (>= 1.0, < 3)
@@ -923,7 +923,7 @@ DEPENDENCIES
   pry (~> 0.13)
   pry-byebug (~> 3.8)
   pry-rails (~> 0.3)
-  puma (~> 5.1.1)
+  puma (~> 6.0.2)
   pundit (~> 2.1)
   pundit-matchers (~> 1.6)
   pusher (~> 1.4)
diff --git a/vendor/cache/mini_portile2-2.5.0.gem b/vendor/cache/mini_portile2-2.5.0.gem
deleted file mode 100644
index cd8b4aa0f954e..0000000000000
Binary files a/vendor/cache/mini_portile2-2.5.0.gem and /dev/null differ
diff --git a/vendor/cache/mini_portile2-2.8.1.gem b/vendor/cache/mini_portile2-2.8.1.gem
new file mode 100644
index 0000000000000..277e0ebcaca87
Binary files /dev/null and b/vendor/cache/mini_portile2-2.8.1.gem differ
diff --git a/vendor/cache/nio4r-2.5.4.gem b/vendor/cache/nio4r-2.5.4.gem
deleted file mode 100644
index f5eaa0c43fe23..0000000000000
Binary files a/vendor/cache/nio4r-2.5.4.gem and /dev/null differ
diff --git a/vendor/cache/nio4r-2.5.8.gem b/vendor/cache/nio4r-2.5.8.gem
new file mode 100644
index 0000000000000..f116b6fc5cc7a
Binary files /dev/null and b/vendor/cache/nio4r-2.5.8.gem differ
diff --git a/vendor/cache/nokogiri-1.11.1-x86_64-darwin.gem b/vendor/cache/nokogiri-1.11.1-x86_64-darwin.gem
deleted file mode 100644
index 2d8c028c2351a..0000000000000
Binary files a/vendor/cache/nokogiri-1.11.1-x86_64-darwin.gem and /dev/null differ
diff --git a/vendor/cache/nokogiri-1.11.1-x86_64-linux.gem b/vendor/cache/nokogiri-1.11.1-x86_64-linux.gem
deleted file mode 100644
index e03cbd3fb5379..0000000000000
Binary files a/vendor/cache/nokogiri-1.11.1-x86_64-linux.gem and /dev/null differ
diff --git a/vendor/cache/nokogiri-1.11.1.gem b/vendor/cache/nokogiri-1.11.1.gem
deleted file mode 100644
index 0233e904c46d6..0000000000000
Binary files a/vendor/cache/nokogiri-1.11.1.gem and /dev/null differ
diff --git a/vendor/cache/nokogiri-1.13.10-x86_64-darwin.gem b/vendor/cache/nokogiri-1.13.10-x86_64-darwin.gem
new file mode 100644
index 0000000000000..3670382e0d17b
Binary files /dev/null and b/vendor/cache/nokogiri-1.13.10-x86_64-darwin.gem differ
diff --git a/vendor/cache/nokogiri-1.13.10-x86_64-linux.gem b/vendor/cache/nokogiri-1.13.10-x86_64-linux.gem
new file mode 100644
index 0000000000000..8a7f2b6ad0e5d
Binary files /dev/null and b/vendor/cache/nokogiri-1.13.10-x86_64-linux.gem differ
diff --git a/vendor/cache/nokogiri-1.13.10.gem b/vendor/cache/nokogiri-1.13.10.gem
new file mode 100644
index 0000000000000..25012e35bb033
Binary files /dev/null and b/vendor/cache/nokogiri-1.13.10.gem differ
diff --git a/vendor/cache/puma-5.1.1.gem b/vendor/cache/puma-5.1.1.gem
deleted file mode 100644
index 219ebb0d50863..0000000000000
Binary files a/vendor/cache/puma-5.1.1.gem and /dev/null differ
diff --git a/vendor/cache/puma-6.0.2.gem b/vendor/cache/puma-6.0.2.gem
new file mode 100644
index 0000000000000..f77a21325078e
Binary files /dev/null and b/vendor/cache/puma-6.0.2.gem differ
diff --git a/vendor/cache/racc-1.5.2.gem b/vendor/cache/racc-1.5.2.gem
deleted file mode 100644
index 39f03fa79c387..0000000000000
Binary files a/vendor/cache/racc-1.5.2.gem and /dev/null differ
diff --git a/vendor/cache/racc-1.6.2.gem b/vendor/cache/racc-1.6.2.gem
new file mode 100644
index 0000000000000..5e8cdad3eac98
Binary files /dev/null and b/vendor/cache/racc-1.6.2.gem differ