railties 7.2.2.2 → 7.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8009fa588f07cda8a4b7c679458e6c63c086752e0705a86b655a40839f939e9f
-  data.tar.gz: 7924907690eeb96418682545eb00365039b467768829e73148c0ac88283b6704
+  metadata.gz: 03707d5a40324d24b583b991da92609ad85de44f8c3a6bb04f03b0281916b6e2
+  data.tar.gz: a8bef9574493a2ee9cafcb97558267c8b48a6c63038c0198d2e5c815bb4801fd
 SHA512:
-  metadata.gz: ab68f603242dc368dd9463696055540f3c934f0b2c0e0c59aacdc4bf1407b785cce046a6cd1c058707102942df886c6cef29ac278c47cc51b276ccf485b375b5
-  data.tar.gz: 971f1611acc1d4aead3a199ecffab02c5e72bfbf716565c254cb6bda21c0ce0520ae4e9950756f408eb7afce173701d3495d2868b49599abaf0c039f03b66f24
+  metadata.gz: 2d3f02e3af390201315588a8e8b8ff1aae3356c97d634f61ab99cdd6c627e525014ea9781fb406b7d89d70b33b3446e6235c4f0e7bd9d508bf5690511ae4af31
+  data.tar.gz: 1e931d3f0d663841df219a0a2d17ee4abadf4b5f785e2747cff8012738dad6e7a57e4c7c40c8f21002b1d36ccd342c2e821a9644a3a3074606beaa18bff4446d

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## Rails 7.2.3 (October 28, 2025) ##
+
+*   Use `secret_key_base` from ENV or credentials when present locally.
+
+    When ENV["SECRET_KEY_BASE"] or
+    `Rails.application.credentials.secret_key_base` is set for test or
+    development, it is used for the `Rails.config.secret_key_base`,
+    instead of generating a `tmp/local_secret.txt` file.
+
+    *Petrik de Heus*
+
+
 ## Rails 7.2.2.2 (August 13, 2025) ##
 
 *   No changes.

data/README.rdoc

@@ -34,6 +34,6 @@ Bug reports can be filed for the Ruby on \Rails project here:
 
 * https://github.com/rails/rails/issues
 
-Feature requests should be discussed on the rails-core mailing list here:
+Feature requests should be discussed on the rubyonrails-core forum here:
 
 * https://discuss.rubyonrails.org/c/rubyonrails-core

data/lib/minitest/rails_plugin.rb

@@ -25,7 +25,7 @@ module Minitest
     end
   end
 
-  class ProfileReporter < StatisticsReporter
+  class ProfileReporter < Reporter
     def initialize(io = $stdout, options = {})
       super
       @results = []

data/lib/rails/application/bootstrap.rb

@@ -60,9 +60,7 @@ module Rails
           end
         else
           Rails.logger.level = ActiveSupport::Logger.const_get(config.log_level.to_s.upcase)
-          broadcast_logger = ActiveSupport::BroadcastLogger.new(Rails.logger)
-          broadcast_logger.formatter = Rails.logger.formatter
-          Rails.logger = broadcast_logger
+          Rails.logger = ActiveSupport::BroadcastLogger.new(Rails.logger)
         end
       end
 

data/lib/rails/application/configuration.rb

@@ -500,16 +500,18 @@ module Rails
 
       def secret_key_base
         @secret_key_base || begin
-          self.secret_key_base = if generate_local_secret?
+          self.secret_key_base = if ENV["SECRET_KEY_BASE_DUMMY"]
             generate_local_secret
           else
-            ENV["SECRET_KEY_BASE"] || Rails.application.credentials.secret_key_base
+            ENV["SECRET_KEY_BASE"] ||
+              Rails.application.credentials.secret_key_base ||
+              (Rails.env.local? && generate_local_secret)
           end
         end
       end
 
       def secret_key_base=(new_secret_key_base)
-        if new_secret_key_base.nil? && generate_local_secret?
+        if new_secret_key_base.nil? && Rails.env.local?
           @secret_key_base = generate_local_secret
         elsif new_secret_key_base.is_a?(String) && new_secret_key_base.present?
           @secret_key_base = new_secret_key_base
@@ -637,10 +639,6 @@ module Rails
 
           File.binread(key_file)
         end
-
-        def generate_local_secret?
-          Rails.env.local? || ENV["SECRET_KEY_BASE_DUMMY"]
-        end
     end
   end
 end

data/lib/rails/application.rb

@@ -454,18 +454,21 @@ module Rails
     # is used to create all ActiveSupport::MessageVerifier and ActiveSupport::MessageEncryptor instances,
     # including the ones that sign and encrypt cookies.
     #
-    # In development and test, this is randomly generated and stored in a
-    # temporary file in <tt>tmp/local_secret.txt</tt>.
+    # We look for it first in <tt>ENV["SECRET_KEY_BASE"]</tt>, then in
+    # +credentials.secret_key_base+. For most applications, the correct place
+    # to store it is in the encrypted credentials file.
     #
-    # You can also set <tt>ENV["SECRET_KEY_BASE_DUMMY"]</tt> to trigger the use of a randomly generated
-    # secret_key_base that's stored in a temporary file. This is useful when precompiling assets for
-    # production as part of a build step that otherwise does not need access to the production secrets.
+    # In development and test, if the secret_key_base is still empty, it is
+    # randomly generated and stored in a temporary file in
+    # <tt>tmp/local_secret.txt</tt>.
     #
-    # Dockerfile example: <tt>RUN SECRET_KEY_BASE_DUMMY=1 bundle exec rails assets:precompile</tt>.
+    # Generating a random secret_key_base and storing it in
+    # <tt>tmp/local_secret.txt</tt> can also be triggered by setting
+    # <tt>ENV["SECRET_KEY_BASE_DUMMY"]</tt>. This is useful when precompiling
+    # assets for production as part of a build step that otherwise does not
+    # need access to the production secrets.
     #
-    # In all other environments, we look for it first in <tt>ENV["SECRET_KEY_BASE"]</tt>,
-    # then +credentials.secret_key_base+. For most applications, the correct place to store it is in the
-    # encrypted credentials file.
+    # Dockerfile example: <tt>RUN SECRET_KEY_BASE_DUMMY=1 bundle exec rails assets:precompile</tt>.
     def secret_key_base
       config.secret_key_base
     end

data/lib/rails/backtrace_cleaner.rb

@@ -5,7 +5,7 @@ require "active_support/core_ext/string/access"
 
 module Rails
   class BacktraceCleaner < ActiveSupport::BacktraceCleaner # :nodoc:
-    APP_DIRS_PATTERN = /\A(?:\.\/)?(?:app|config|lib|test|\(\w*\))/
+    APP_DIRS_PATTERN = /\A(?:\.\/)?(?:app|config|lib|test|\(\w+(?:-\w+)*\))/
     RENDER_TEMPLATE_PATTERN = /:in [`'].*_\w+_{2,3}\d+_\d+'/
 
     def initialize

data/lib/rails/commands/console/irb_console.rb

@@ -60,24 +60,11 @@ module Rails
       end
     end
 
-    class ReloadCommand < IRB::Command::Base
-      include ConsoleMethods
-
-      category "Rails console"
-      description "Reloads the Rails application."
-
-      def execute(*)
-        puts "Reloading..."
-        Rails.application.reloader.reload!
-      end
-    end
-
     IRB::HelperMethod.register(:helper, ControllerHelper)
     IRB::HelperMethod.register(:controller, ControllerInstance)
     IRB::HelperMethod.register(:new_session, NewSession)
     IRB::HelperMethod.register(:app, AppInstance)
     IRB::HelperMethod.register(:reload!, ReloadHelper)
-    IRB::Command.register(:reload!, ReloadCommand)
 
     class IRBConsole
       def initialize(app)

data/lib/rails/commands/test/test_command.rb

@@ -31,8 +31,6 @@ module Rails
         Rails::TestUnit::Runner.parse_options(args)
         run_prepare_task if self.args.none?(EXACT_TEST_ARGUMENT_PATTERN)
         Rails::TestUnit::Runner.run(args)
-      rescue Rails::TestUnit::InvalidTestError => error
-        raise ArgumentError, error.message
       end
 
       # Define Thor tasks to avoid going through Rake and booting twice when using bin/rails test:*

data/lib/rails/gem_version.rb

@@ -9,8 +9,8 @@ module Rails
   module VERSION
     MAJOR = 7
     MINOR = 2
-    TINY  = 2
-    PRE   = "2"
+    TINY  = 3
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/rails/generators/actions.rb

@@ -445,8 +445,8 @@ module Rails
 
       private
         # Define log for backwards compatibility. If just one argument is sent,
-        # invoke say, otherwise invoke say_status. Differently from say and
-        # similarly to say_status, this method respects the quiet? option given.
+        # invoke +say+, otherwise invoke +say_status+. Differently from +say+ and
+        # similarly to +say_status+, this method respects the +quiet?+ option given.
         def log(*args) # :doc:
           if args.size == 1
             say args.first.to_s unless options.quiet?
@@ -456,7 +456,7 @@ module Rails
           end
         end
 
-        # Runs the supplied command using either "rake ..." or "rails ..."
+        # Runs the supplied command using either +rake+ or +rails+
         # based on the executor parameter provided.
         def execute_command(executor, command, options = {}) # :doc:
           log executor, command
@@ -490,12 +490,16 @@ module Rails
         end
         alias rebase_indentation optimize_indentation
 
-        # Indent the +Gemfile+ to the depth of @indentation
+        # Returns a string corresponding to the current indentation level
+        # (i.e. 2 * <code>@indentation</code> spaces). See also
+        # #with_indentation, which can be used to manage the indentation level.
         def indentation # :doc:
           "  " * @indentation
         end
 
-        # Manage +Gemfile+ indentation for a DSL action block
+        # Increases the current indentation indentation level for the duration
+        # of the given block, and decreases it after the block ends. Call
+        # #indentation to get an indentation string.
         def with_indentation(&block) # :doc:
           @indentation += 1
           instance_eval(&block)

data/lib/rails/generators/app_base.rb

@@ -589,7 +589,7 @@ module Rails
 
       def dockerfile_build_packages
         # start with the essentials
-        packages = %w(build-essential git pkg-config)
+        packages = %w(build-essential git pkg-config libyaml-dev)
 
         # add database support
         packages << database.build_package unless skip_active_record?
@@ -665,7 +665,7 @@ module Rails
       end
 
       def depend_on_bootsnap?
-        !options[:skip_bootsnap] && !options[:dev] && !defined?(JRUBY_VERSION)
+        !options[:skip_bootsnap] && !options[:dev] && !jruby?
       end
 
       def target_rails_prerelease(self_command = "new")
@@ -722,7 +722,7 @@ module Rails
       end
 
       def add_bundler_platforms
-        if bundle_install?
+        if bundle_install? && !jruby?
           # The vast majority of Rails apps will be deployed on `x86_64-linux`.
           bundle_command("lock --add-platform=x86_64-linux")
 
@@ -731,6 +731,10 @@ module Rails
         end
       end
 
+      def jruby?
+        defined?(JRUBY_VERSION)
+      end
+
       def generate_bundler_binstub
         if bundle_install?
           bundle_command("binstubs bundler")

data/lib/rails/generators/rails/app/templates/github/ci.yml.tt

@@ -120,8 +120,10 @@ jobs:
       - name: Run tests
         env:
           RAILS_ENV: test
-          <%- if options[:database] == "mysql" || options[:database] == "trilogy" -%>
+          <%- if options[:database] == "mysql" -%>
           DATABASE_URL: mysql2://127.0.0.1:3306
+          <%- elsif options[:database] == "trilogy" -%>
+          DATABASE_URL: trilogy://127.0.0.1:3306
           <%- elsif options[:database] == "postgresql" -%>
           DATABASE_URL: postgres://postgres:postgres@localhost:5432
           <%- end -%>

data/lib/rails/generators/rails/plugin/templates/github/ci.yml.tt

@@ -84,8 +84,10 @@ jobs:
       - name: Run tests
         env:
           RAILS_ENV: test
-          <%- if options[:database] == "mysql" || options[:database] == "trilogy" -%>
+          <%- if options[:database] == "mysql" -%>
           DATABASE_URL: mysql2://127.0.0.1:3306
+          <%- elsif options[:database] == "trilogy" -%>
+          DATABASE_URL: trilogy://127.0.0.1:3306
           <%- elsif options[:database] == "postgresql" -%>
           DATABASE_URL: postgres://postgres:postgres@localhost:5432
           <%- end -%>
@@ -100,4 +102,3 @@ jobs:
           path: ${{ github.workspace }}/tmp/screenshots
           if-no-files-found: ignore
 <% end -%>
-

data/lib/rails/generators/rails/scaffold_controller/templates/api_controller.rb.tt

@@ -21,7 +21,7 @@ class <%= controller_class_name %>Controller < ApplicationController
     if @<%= orm_instance.save %>
       render json: <%= "@#{singular_table_name}" %>, status: :created, location: <%= "@#{singular_table_name}" %>
     else
-      render json: <%= "@#{orm_instance.errors}" %>, status: :unprocessable_entity
+      render json: <%= "@#{orm_instance.errors}" %>, status: <%= ActionDispatch::Constants::UNPROCESSABLE_CONTENT.inspect %>
     end
   end
 
@@ -30,7 +30,7 @@ class <%= controller_class_name %>Controller < ApplicationController
     if @<%= orm_instance.update("#{singular_table_name}_params") %>
       render json: <%= "@#{singular_table_name}" %>
     else
-      render json: <%= "@#{orm_instance.errors}" %>, status: :unprocessable_entity
+      render json: <%= "@#{orm_instance.errors}" %>, status: <%= ActionDispatch::Constants::UNPROCESSABLE_CONTENT.inspect %>
     end
   end
 

data/lib/rails/generators/rails/scaffold_controller/templates/controller.rb.tt

@@ -27,7 +27,7 @@ class <%= controller_class_name %>Controller < ApplicationController
     if @<%= orm_instance.save %>
       redirect_to <%= redirect_resource_name %>, notice: <%= %("#{human_name} was successfully created.") %>
     else
-      render :new, status: :unprocessable_entity
+      render :new, status: <%= ActionDispatch::Constants::UNPROCESSABLE_CONTENT.inspect %>
     end
   end
 
@@ -36,7 +36,7 @@ class <%= controller_class_name %>Controller < ApplicationController
     if @<%= orm_instance.update("#{singular_table_name}_params") %>
       redirect_to <%= redirect_resource_name %>, notice: <%= %("#{human_name} was successfully updated.") %>, status: :see_other
     else
-      render :edit, status: :unprocessable_entity
+      render :edit, status: <%= ActionDispatch::Constants::UNPROCESSABLE_CONTENT.inspect %>
     end
   end
 

data/lib/rails/generators.rb

@@ -97,11 +97,11 @@ module Rails
       # generator group to fall back to another group in case of missing generators,
       # they can add a fallback.
       #
-      # For example, shoulda is considered a test_framework and is an extension
-      # of test_unit. However, most part of shoulda generators are similar to
-      # test_unit ones.
+      # For example, shoulda is considered a +test_framework+ and is an extension
+      # of +test_unit+. However, most part of shoulda generators are similar to
+      # +test_unit+ ones.
       #
-      # Shoulda then can tell generators to search for test_unit generators when
+      # Shoulda then can tell generators to search for +test_unit+ generators when
       # some of them are not available by adding a fallback:
       #
       #   Rails::Generators.fallbacks[:shoulda] = :test_unit
@@ -316,7 +316,7 @@ module Rails
 
         def run_after_generate_callback
           if defined?(@@generated_files) && !@@generated_files.empty?
-            @after_generate_callbacks.each do |callback|
+            after_generate_callbacks.each do |callback|
               callback.call(@@generated_files)
             end
             @@generated_files = []

data/lib/rails/test_unit/runner.rb

@@ -9,13 +9,17 @@ require "rails/test_unit/test_parser"
 
 module Rails
   module TestUnit
-    class InvalidTestError < StandardError
+    class InvalidTestError < ArgumentError
       def initialize(path, suggestion)
-        super(<<~MESSAGE.squish)
+        super(<<~MESSAGE.rstrip)
           Could not load test file: #{path}.
           #{suggestion}
         MESSAGE
       end
+
+      def backtrace(*args)
+        []
+      end
     end
 
     class Runner
@@ -68,7 +72,7 @@ module Rails
               if corrections.empty?
                 raise exception
               end
-              raise InvalidTestError.new(path, DidYouMean::Formatter.message_for(corrections))
+              raise(InvalidTestError.new(path, DidYouMean::Formatter.message_for(corrections)), cause: nil)
             else
               raise
             end

data/lib/rails/test_unit/test_parser.rb

@@ -13,29 +13,32 @@ if defined?(Prism)
       # Parse a test file to extract the line ranges of all tests in both
       # method-style (def test_foo) and declarative-style (test "foo" do)
       module TestParser
+        @begins_to_ends = {}
         # Helper to translate a method object into the path and line range where
         # the method was defined.
         def self.definition_for(method)
           filepath, start_line = method.source_location
-          queue = [Prism.parse_file(filepath).value]
+          @begins_to_ends[filepath] ||= ranges(filepath)
+          return unless end_line = @begins_to_ends[filepath][start_line]
+          [filepath, start_line..end_line]
+        end
 
-          while (node = queue.shift)
-            case node.type
-            when :def_node
-              if node.location.start_line == start_line
-                return [filepath, start_line..node.location.end_line]
+        private
+          def self.ranges(filepath)
+            queue = [Prism.parse_file(filepath).value]
+            begins_to_ends = {}
+            while (node = queue.shift)
+              case node.type
+              when :def_node
+                begins_to_ends[node.location.start_line] = node.location.end_line
+              when :call_node
+                begins_to_ends[node.location.start_line] = node.location.end_line
               end
-            when :call_node
-              if node.location.start_line == start_line
-                return [filepath, start_line..node.location.end_line]
-              end
-            end
 
-            queue.concat(node.compact_child_nodes)
+              queue.concat(node.compact_child_nodes)
+            end
+            begins_to_ends
           end
-
-          nil
-        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: railties
 version: !ruby/object:Gem::Version
-  version: 7.2.2.2
+  version: 7.2.3
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -15,28 +15,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.2.2.2
+        version: 7.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.2.2.2
+        version: 7.2.3
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.2.2.2
+        version: 7.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.2.2.2
+        version: 7.2.3
+- !ruby/object:Gem::Dependency
+  name: cgi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rackup
   requirement: !ruby/object:Gem::Requirement
@@ -113,20 +127,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.13'
+- !ruby/object:Gem::Dependency
+  name: tsort
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: actionview
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.2.2.2
+        version: 7.2.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.2.2.2
+        version: 7.2.3
 description: 'Rails internals: application bootup, plugins, generators, and rake tasks.'
 email: david@loudthinking.com
 executables:
@@ -468,10 +496,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v7.2.2.2/railties/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v7.2.2.2/
+  changelog_uri: https://github.com/rails/rails/blob/v7.2.3/railties/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v7.2.3/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v7.2.2.2/railties
+  source_code_uri: https://github.com/rails/rails/tree/v7.2.3/railties
   rubygems_mfa_required: 'true'
 rdoc_options:
 - "--exclude"