From 3b229e9aabc551a90b4d6f9643a5b12368a408b4 Mon Sep 17 00:00:00 2001
From: Mike Dalessio <mike@37signals.com>
Date: Wed, 18 Feb 2026 15:10:11 -0500
Subject: [PATCH] Pin web-console to GitHub main for Rails compatibility

web-console 4.2.1 overrides the now-renamed filter_proxies method in
ActionDispatch::RemoteIp::GetIp. The fix (rails/web-console#344) is on
main but not yet released.
---
 Gemfile           |  2 +-
 Gemfile.lock      | 16 ++++++++++------
 Gemfile.saas.lock | 16 ++++++++++------
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/Gemfile b/Gemfile
index c524ee3c1..882ecb266 100644
--- a/Gemfile
+++ b/Gemfile
@@ -54,7 +54,7 @@ group :development, :test do
 end
 
 group :development do
-  gem "web-console"
+  gem "web-console", github: "rails/web-console"
 end
 
 group :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index 3208ea717..a65b64861 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -113,6 +113,15 @@ GIT
       tsort (>= 0.2)
       zeitwerk (~> 2.6)
 
+GIT
+  remote: https://github.com/rails/web-console.git
+  revision: bdbb39114348b037a515b2ce75a47457b0e647d1
+  specs:
+    web-console (4.2.1)
+      actionview (>= 8.0.0)
+      bindex (>= 0.4.0)
+      railties (>= 8.0.0)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -460,11 +469,6 @@ GEM
     unicode-emoji (4.1.0)
     uri (1.1.1)
     vcr (6.4.0)
-    web-console (4.2.1)
-      actionview (>= 6.0.0)
-      activemodel (>= 6.0.0)
-      bindex (>= 0.4.0)
-      railties (>= 6.0.0)
     web-push (3.1.0)
       jwt (~> 3.0)
       openssl (>= 3.0)
@@ -536,7 +540,7 @@ DEPENDENCIES
   turbo-rails
   useragent!
   vcr
-  web-console
+  web-console!
   web-push
   webmock
   zip_kit
diff --git a/Gemfile.saas.lock b/Gemfile.saas.lock
index 6e39b5ad5..845856d2a 100644
--- a/Gemfile.saas.lock
+++ b/Gemfile.saas.lock
@@ -162,6 +162,15 @@ GIT
       tsort (>= 0.2)
       zeitwerk (~> 2.6)
 
+GIT
+  remote: https://github.com/rails/web-console.git
+  revision: bdbb39114348b037a515b2ce75a47457b0e647d1
+  specs:
+    web-console (4.2.1)
+      actionview (>= 8.0.0)
+      bindex (>= 0.4.0)
+      railties (>= 8.0.0)
+
 PATH
   remote: saas
   specs:
@@ -585,11 +594,6 @@ GEM
     unicode-emoji (4.1.0)
     uri (1.1.1)
     vcr (6.4.0)
-    web-console (4.2.1)
-      actionview (>= 6.0.0)
-      activemodel (>= 6.0.0)
-      bindex (>= 0.4.0)
-      railties (>= 6.0.0)
     web-push (3.1.0)
       jwt (~> 3.0)
       openssl (>= 3.0)
@@ -700,7 +704,7 @@ DEPENDENCIES
   turbo-rails
   useragent!
   vcr
-  web-console
+  web-console!
   web-push
   webmock
   webrick