From: Tom Hughes <tom@compton.nu>
Date: Fri, 11 Apr 2025 23:05:37 +0000 (+0100)
Subject: Update to omniauth 2.1, puma 6 and rack 3
X-Git-Tag: live~29^2~4
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/5037ae2dde6ab2bcfa20835e9b20d2736a847893?ds=sidebyside

Update to omniauth 2.1, puma 6 and rack 3
---

diff --git a/Gemfile b/Gemfile
index a7801fece..7b99731f4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -78,7 +78,7 @@ gem "rack-uri_sanitizer"
 
 # Omniauth for authentication
 gem "multi_json"
-gem "omniauth", "~> 2.0.2"
+gem "omniauth", "~> 2.1.3"
 gem "omniauth-facebook"
 gem "omniauth-github"
 gem "omniauth-google-oauth2", ">= 0.6.0"
@@ -162,7 +162,7 @@ group :test do
   gem "jwt"
   gem "minitest", "~> 5.1"
   gem "minitest-focus", :require => false
-  gem "puma", "~> 5.6"
+  gem "puma", "~> 6.6"
   gem "rails-controller-testing"
   gem "rubocop"
   gem "rubocop-capybara"
@@ -179,8 +179,10 @@ end
 
 group :development, :test do
   gem "annotaterb"
+  gem "rackup"
   gem "teaspoon"
   gem "teaspoon-mocha", "~> 2.3.3"
+  gem "webrick"
 
   # See https://guides.rubyonrails.org/debugging_rails_applications.html#debugging-with-the-debug-gem
   gem "debug", :require => "debug/prelude"
diff --git a/Gemfile.lock b/Gemfile.lock
index bb5012efa..dad42fd29 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -426,9 +426,9 @@ GEM
     octokit (9.2.0)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
-    omniauth (2.0.4)
+    omniauth (2.1.3)
       hashie (>= 3.4.6)
-      rack (>= 1.6.2, < 3)
+      rack (>= 2.2.3)
       rack-protection
     omniauth-facebook (10.0.0)
       bigdecimal
@@ -484,27 +484,28 @@ GEM
       date
       stringio
     public_suffix (6.0.1)
-    puma (5.6.9)
+    puma (6.6.0)
       nio4r (~> 2.0)
     quad_tile (1.0.1)
     racc (1.8.1)
-    rack (2.2.13)
+    rack (3.1.12)
     rack-cors (2.0.2)
       rack (>= 2.0.0)
     rack-openid (1.4.2)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)
-    rack-protection (3.2.0)
+    rack-protection (4.1.1)
       base64 (>= 0.1.0)
-      rack (~> 2.2, >= 2.2.4)
-    rack-session (1.0.2)
-      rack (< 3)
+      logger (>= 1.6.0)
+      rack (>= 3.0.0, < 4)
+    rack-session (2.1.0)
+      base64 (>= 0.1.0)
+      rack (>= 3.0.0)
     rack-test (2.2.0)
       rack (>= 1.3)
     rack-uri_sanitizer (0.0.2)
-    rackup (1.0.1)
-      rack (< 3)
-      webrick
+    rackup (2.2.1)
+      rack (>= 3)
     rails (8.0.2)
       actioncable (= 8.0.2)
       actionmailbox (= 8.0.2)
@@ -749,7 +750,7 @@ DEPENDENCIES
   minitest (~> 5.1)
   minitest-focus
   multi_json
-  omniauth (~> 2.0.2)
+  omniauth (~> 2.1.3)
   omniauth-facebook
   omniauth-github
   omniauth-google-oauth2 (>= 0.6.0)
@@ -760,10 +761,11 @@ DEPENDENCIES
   openstreetmap-deadlock_retry (>= 1.3.1)
   overcommit
   pg
-  puma (~> 5.6)
+  puma (~> 6.6)
   quad_tile (~> 1.0.1)
   rack-cors
   rack-uri_sanitizer
+  rackup
   rails (~> 8.0.0)
   rails-controller-testing
   rails-i18n (~> 8.0.0)
@@ -794,6 +796,7 @@ DEPENDENCIES
   validates_email_format_of (>= 1.5.1)
   vendorer
   webmock
+  webrick
 
 BUNDLED WITH
-   2.5.22
+   2.6.2