From 36419c3600d71bb8f085852e1a714ad16f3c20eb Mon Sep 17 00:00:00 2001
From: Thiago Youssef <43591948+thiagoyoussef@users.noreply.github.com>
Date: Thu, 11 Dec 2025 11:15:54 -0300
Subject: [PATCH] Bump rails version to remove svg renderer patch (#2081)

---
 Gemfile                                          |  2 +-
 Gemfile.lock                                     | 16 ++++++++--------
 .../action_controller_svg_renderer.rb            |  7 -------
 3 files changed, 9 insertions(+), 16 deletions(-)
 delete mode 100644 config/initializers/action_controller_svg_renderer.rb

diff --git a/Gemfile b/Gemfile
index e8a5f8514..8c6d39d0f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,7 @@ source "https://rubygems.org"
 
 git_source(:bc) { |repo| "https://github.com/basecamp/#{repo}" }
 
-gem "rails", github: "rails/rails", branch: "ast-immediate-variants-process-locally"
+gem "rails", github: "rails/rails", branch: "main"
 
 # Assets & front end
 gem "importmap-rails"
diff --git a/Gemfile.lock b/Gemfile.lock
index d99375463..b0ef0a648 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -13,8 +13,8 @@ GIT
 
 GIT
   remote: https://github.com/rails/rails.git
-  revision: 0636a79d1bf268db6cdbbc6327106d08c3ff3751
-  branch: ast-immediate-variants-process-locally
+  revision: 4f4e0acaf558f6adf7df3ac23a51beb470463901
+  branch: main
   specs:
     actioncable (8.2.0.alpha)
       actionpack (= 8.2.0.alpha)
@@ -172,7 +172,7 @@ GEM
       bigdecimal
       rexml
     crass (1.0.6)
-    date (3.5.0)
+    date (3.5.1)
     debug (1.11.0)
       irb (~> 1.10)
       reline (>= 0.3.8)
@@ -223,7 +223,7 @@ GEM
       actionview (>= 7.0.0)
       activesupport (>= 7.0.0)
     jmespath (1.6.2)
-    json (2.17.1)
+    json (2.18.0)
     jwt (3.1.2)
       base64
     kamal (2.9.0)
@@ -329,7 +329,7 @@ GEM
       actionpack (>= 7.0.0)
       activesupport (>= 7.0.0)
       rack
-    psych (5.2.6)
+    psych (5.3.0)
       date
       stringio
     public_suffix (7.0.0)
@@ -345,7 +345,7 @@ GEM
       rack (>= 3.0.0)
     rack-test (2.2.0)
       rack (>= 1.3)
-    rackup (2.2.1)
+    rackup (2.3.1)
       rack (>= 3)
     rails-dom-testing (2.3.0)
       activesupport (>= 5.0.0)
@@ -356,7 +356,7 @@ GEM
       nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
     rainbow (3.1.1)
     rake (13.3.1)
-    rdoc (6.16.1)
+    rdoc (6.17.0)
       erb
       psych (>= 4.0.0)
       tsort
@@ -455,7 +455,7 @@ GEM
     thruster (0.1.16-arm64-darwin)
     thruster (0.1.16-x86_64-darwin)
     thruster (0.1.16-x86_64-linux)
-    timeout (0.4.4)
+    timeout (0.5.0)
     trilogy (2.9.0)
     tsort (0.2.0)
     turbo-rails (2.0.20)
diff --git a/config/initializers/action_controller_svg_renderer.rb b/config/initializers/action_controller_svg_renderer.rb
deleted file mode 100644
index c10e16d20..000000000
--- a/config/initializers/action_controller_svg_renderer.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-# FIXME: Upstream to Rails
-Rails.application.config.after_initialize do
-  ActionController.add_renderer :svg do |svg, options|
-    self.content_type = Mime[:svg] if media_type.nil?
-    svg
-  end
-end