Merge remote-tracking branch 'parent/main' into upstream-20240326

config/initializers/application_controller_renderer.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # ActiveSupport::Reloader.to_prepare do

config/initializers/propshaft.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+Rails.application.config.assets.paths << Rails.root.join('app', 'javascript', 'images')