railties 7.1.1 → 7.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef62f9bd93d210f9dab067b6c425e87856270615f9416e347c74d833453096b2
-  data.tar.gz: f405f87214572e3e77d2c6916342dafd8809a6e956518040adb57938ea2d9e19
+  metadata.gz: 8c529251b08d62ea8d3e2b261f9863382b32783ef34f1af4a50f3cc9bff1abc3
+  data.tar.gz: 3b8d46f6bea256a8e7998e9c44589d0ce8c0cdc9064a96083167ac9043e57f17
 SHA512:
-  metadata.gz: ac990f46b016fbc43c559511596e6c6e84a911dd1d5ae3cee65746cefd9f84691979e55f02c5d0a50da4d55720b44d72609db3da6fe9d507927d64a7030a6c5a
-  data.tar.gz: f8bf05ced8bfdc32dd941eaac774b9daa70878480d9c3331b02450c4bd5aa4f1cc98c9cba5840a11f2c0e3c2880c822b045bb5f751992ac5eaf461c333f33f07
+  metadata.gz: a9883784c3d94e282969fe8ab8e2de689a824b66369b18fd902111671376152ac97d2a17427c1145bfdf11ea20bcb7d896cac66a4ba1dfd7245236805dc8be3b
+  data.tar.gz: bf25c78a46a71fd9c27c02f9432ffd97bc308c5567911d8cabffb9ea5b784e5ec015bc7a2f820d67cbfff70b1dbac9a9a9f19a7a86467b503ab31015b5909659

data/CHANGELOG.md

@@ -1,3 +1,41 @@
+## Rails 7.1.3 (January 16, 2024) ##
+
+*   Make sure `config.after_routes_loaded` hook runs on boot.
+
+    *Rafael Mendonça França*
+
+*   Fix `config.log_level` not being respected when using a `BroadcastLogger`
+
+    *Édouard Chin*
+
+*   Fix isolated engines to take `ActiveRecord::Base.table_name_prefix` into consideration.
+    This will allow for engine defined models, such as inside Active Storage, to respect
+    Active Record table name prefix configuration.
+
+    *Chedli Bourguiba*
+
+*   The `bin/rails app:template` command will no longer add potentially unwanted
+    gem platforms via `bundle lock --add-platform=...` commands.
+
+    *Jonathan Hefner*
+
+
+## Rails 7.1.2 (November 10, 2023) ##
+
+*   Fix running `db:system:change` when app has no Dockerfile.
+
+    *Hartley McGuire*
+
+*   If you accessed `config.eager_load_paths` and friends, later changes to
+    `config.paths` were not reflected in the expected auto/eager load paths.
+    Now, they are.
+
+    This bug has been latent since Rails 3.
+
+    Fixes #49629.
+
+    *Xavier Noria*
+
 ## Rails 7.1.1 (October 11, 2023) ##
 
 *   Ensures the Rails generated Dockerfile uses correct ruby version and matches Gemfile.

data/lib/rails/application/bootstrap.rb

@@ -54,9 +54,13 @@ module Rails
           )
           logger
         end
-        Rails.logger.level = ActiveSupport::Logger.const_get(config.log_level.to_s.upcase)
 
-        unless Rails.logger.is_a?(ActiveSupport::BroadcastLogger)
+        if Rails.logger.is_a?(ActiveSupport::BroadcastLogger)
+          if config.broadcast_log_level
+            Rails.logger.level = ActiveSupport::Logger.const_get(config.broadcast_log_level.to_s.upcase)
+          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

data/lib/rails/application/configuration.rb

@@ -19,13 +19,13 @@ module Rails
                     :ssl_options, :public_file_server,
                     :session_options, :time_zone, :reload_classes_only_on_change,
                     :beginning_of_week, :filter_redirect, :x,
-                    :read_encrypted_secrets, :log_level, :content_security_policy_report_only,
+                    :read_encrypted_secrets, :content_security_policy_report_only,
                     :content_security_policy_nonce_generator, :content_security_policy_nonce_directives,
                     :require_master_key, :credentials, :disable_sandbox, :sandbox_by_default,
                     :add_autoload_paths_to_load_path, :rake_eager_load, :server_timing, :log_file_size,
                     :dom_testing_default_html_version
 
-      attr_reader :encoding, :api_only, :loaded_config_version
+      attr_reader :encoding, :api_only, :loaded_config_version, :log_level
 
       def initialize(*)
         super
@@ -379,6 +379,15 @@ module Rails
         @debug_exception_response_format ||= :api
       end
 
+      def log_level=(level)
+        @log_level = level
+        @broadcast_log_level = level
+      end
+
+      def broadcast_log_level # :nodoc:
+        defined?(@broadcast_log_level) ? @broadcast_log_level : nil
+      end
+
       def debug_exception_response_format
         @debug_exception_response_format || :default
       end

data/lib/rails/application/finisher.rb

@@ -160,6 +160,7 @@ module Rails
         reloader.eager_load = app.config.eager_load
         reloader.execute
         reloaders << reloader
+
         app.reloader.to_run do
           # We configure #execute rather than #execute_if_updated because if
           # autoloaded constants are cleared we need to reload routes also in
@@ -174,6 +175,8 @@ module Rails
           reloader.execute
           ActiveSupport.run_load_hooks(:after_routes_loaded, self)
         end
+
+        ActiveSupport.run_load_hooks(:after_routes_loaded, self)
       end
 
       # Set clearing dependencies after the finisher hook to ensure paths

data/lib/rails/application.rb

@@ -234,8 +234,7 @@ module Rails
     end
 
     # Convenience for loading config/foo.yml for the current \Rails env.
-    #
-    # Examples:
+    # Example:
     #
     #     # config/exception_notification.yml:
     #     production:
@@ -246,13 +245,15 @@ module Rails
     #       url: http://localhost:3001
     #       namespace: my_app_development
     #
+    # <code></code>
+    #
     #     # config/environments/production.rb
     #     Rails.application.configure do
     #       config.middleware.use ExceptionNotifier, config_for(:exception_notification)
     #     end
     #
-    #     # You can also store configurations in a shared section which will be
-    #     # merged with the environment configuration
+    # You can also store configurations in a shared section which will be merged
+    # with the environment configuration
     #
     #     # config/example.yml
     #     shared:
@@ -265,6 +266,8 @@ module Rails
     #         bar:
     #           qux: 2
     #
+    # <code></code>
+    #
     #     # development environment
     #     Rails.application.config_for(:example)[:foo][:bar]
     #     # => { baz: 1, qux: 2 }
@@ -477,7 +480,21 @@ module Rails
         config.secret_key_base ||= generate_local_secret
       else
         validate_secret_key_base(
-          ENV["SECRET_KEY_BASE"] || credentials.secret_key_base || secrets.secret_key_base
+          ENV["SECRET_KEY_BASE"] || credentials.secret_key_base || begin
+            secret_skb = secrets_secret_key_base
+
+            if secret_skb.equal?(config.secret_key_base)
+              config.secret_key_base
+            else
+              Rails.deprecator.warn(<<~MSG.squish)
+                Your `secret_key_base` is configured in `Rails.application.secrets`,
+                which is deprecated in favor of `Rails.application.credentials` and
+                will be removed in Rails 7.2.
+              MSG
+
+              secret_skb
+            end
+          end
         )
       end
     end

data/lib/rails/commands/credentials/USAGE

@@ -26,7 +26,7 @@ Setup:
     is easier to manage. You could set `RAILS_MASTER_KEY` in a deployment
     configuration, or you could prepend it to your server's start command like so:
 
-        RAILS_MASTER_KEY="very-secret-and-secure" server.start
+        RAILS_MASTER_KEY="very-secret-and-secure" bin/rails server
 
     If `ENV["RAILS_MASTER_KEY"]` is present, it takes precedence over
     `config/master.key`.

data/lib/rails/commands/secrets/USAGE

@@ -27,7 +27,7 @@ Setup:
 
     You could prepend that to your server's start command like this:
 
-        RAILS_MASTER_KEY="im-the-master-now-hahaha" server.start
+        RAILS_MASTER_KEY="im-the-master-now-hahaha" bin/rails server
 
     The `config/secrets.yml.enc` has much the same format as `config/secrets.yml`:
 

data/lib/rails/commands/secrets/secrets_command.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "active_support"
+require "active_support/core_ext/string/filters"
 require "rails/secrets"
 require "rails/command/helpers/editor"
 

data/lib/rails/engine/configuration.rb

@@ -9,12 +9,45 @@ module Rails
       attr_accessor :middleware, :javascript_path
       attr_writer :eager_load_paths, :autoload_once_paths, :autoload_paths
 
+      # An array of custom autoload paths to be added to the ones defined
+      # automatically by Rails. These won't be eager loaded, unless you push
+      # them to +eager_load_paths+ too, which is recommended.
+      #
+      # This collection is empty by default, it accepts strings and +Pathname+
+      # objects.
+      #
+      # If you'd like to add +lib+ to it, please see +autoload_lib+.
+      attr_reader :autoload_paths
+
+      # An array of custom autoload once paths. These won't be eager loaded
+      # unless you push them to +eager_load_paths+ too, which is recommended.
+      #
+      # This collection is empty by default, it accepts strings and +Pathname+
+      # objects.
+      #
+      # If you'd like to add +lib+ to it, please see +autoload_lib_once+.
+      attr_reader :autoload_once_paths
+
+      # An array of custom eager load paths to be added to the ones defined
+      # automatically by Rails. Anything in this collection is considered to be
+      # an autoload path regardless of whether it was added to +autoload_paths+.
+      #
+      # This collection is empty by default, it accepts strings and +Pathname+
+      # objects.
+      #
+      # If you'd like to add +lib+ to it, please see +autoload_lib+.
+      attr_reader :eager_load_paths
+
       def initialize(root = nil)
         super()
         @root = root
         @generators = app_generators.dup
         @middleware = Rails::Configuration::MiddlewareStackProxy.new
         @javascript_path = "javascript"
+
+        @autoload_paths = []
+        @autoload_once_paths = []
+        @eager_load_paths = []
       end
 
       # Holds generators configuration:
@@ -81,16 +114,22 @@ module Rails
         @root = paths.path = Pathname.new(value).expand_path
       end
 
-      def eager_load_paths
-        @eager_load_paths ||= paths.eager_load
+      # Private method that adds custom autoload paths to the ones defined by
+      # +paths+.
+      def all_autoload_paths # :nodoc:
+        autoload_paths + paths.autoload_paths
       end
 
-      def autoload_once_paths
-        @autoload_once_paths ||= paths.autoload_once
+      # Private method that adds custom autoload once paths to the ones defined
+      # by +paths+.
+      def all_autoload_once_paths # :nodoc:
+        autoload_once_paths + paths.autoload_once
       end
 
-      def autoload_paths
-        @autoload_paths ||= paths.autoload_paths
+      # Private method that adds custom eager load paths to the ones defined by
+      # +paths+.
+      def all_eager_load_paths # :nodoc:
+        eager_load_paths + paths.eager_load
       end
     end
   end

data/lib/rails/engine.rb

@@ -15,7 +15,8 @@ module Rails
   # feature and application sharing.
   #
   # Any +Rails::Engine+ is also a Rails::Railtie, so the same
-  # methods (like <tt>rake_tasks</tt> and +generators+) and configuration
+  # methods (like {rake_tasks}[rdoc-ref:Rails::Railtie::rake_tasks] and
+  # {generators}[rdoc-ref:Rails::Railtie::generators]) and configuration
   # options that are available in railties can also be used in engines.
   #
   # == Creating an Engine
@@ -116,7 +117,7 @@ module Rails
   # An engine can also be a Rack application. It can be useful if you have a Rack application that
   # you would like to provide with some of the +Engine+'s features.
   #
-  # To do that, use the +endpoint+ method:
+  # To do that, use the ::endpoint method:
   #
   #   module MyEngine
   #     class Engine < Rails::Engine
@@ -197,7 +198,7 @@ module Rails
   # named routes from the application will be available to your engine's controllers as well.
   #
   # However, sometimes you want to isolate your engine from the application, especially if your engine
-  # has its own router. To do that, you simply need to call +isolate_namespace+. This method requires
+  # has its own router. To do that, you simply need to call ::isolate_namespace. This method requires
   # you to pass a module where all your controllers, helpers, and models should be nested to:
   #
   #   module MyEngine
@@ -300,7 +301,7 @@ module Rails
   #
   # == Isolated engine's helpers
   #
-  # Sometimes you may want to isolate engine, but use helpers that are defined for it.
+  # Sometimes you may want to isolate an engine, but use helpers that are defined for it.
   # If you want to share just a few specific helpers you can add them to application's
   # helpers in ApplicationController:
   #
@@ -327,7 +328,7 @@ module Rails
   # To use engine's migrations in application you can use the rake task below, which copies them to
   # application's dir:
   #
-  #   rake ENGINE_NAME:install:migrations
+  #   $ rake ENGINE_NAME:install:migrations
   #
   # Note that some of the migrations may be skipped if a migration with the same name already exists
   # in application. In such a situation you must decide whether to leave that migration or rename the
@@ -395,6 +396,12 @@ module Rails
 
             unless mod.respond_to?(:table_name_prefix)
               define_method(:table_name_prefix) { "#{name}_" }
+
+              ActiveSupport.on_load(:active_record) do
+                mod.singleton_class.redefine_method(:table_name_prefix) do
+                  "#{ActiveRecord::Base.table_name_prefix}#{name}_"
+                end
+              end
             end
 
             unless mod.respond_to?(:use_relative_model_naming?)
@@ -578,7 +585,7 @@ module Rails
     end
 
     initializer :set_eager_load_paths, before: :bootstrap_hook do
-      ActiveSupport::Dependencies._eager_load_paths.merge(config.eager_load_paths)
+      ActiveSupport::Dependencies._eager_load_paths.merge(config.all_eager_load_paths)
       config.eager_load_paths.freeze
     end
 
@@ -705,14 +712,14 @@ module Rails
       end
 
       def _all_autoload_once_paths
-        config.autoload_once_paths.uniq
+        config.all_autoload_once_paths.uniq
       end
 
       def _all_autoload_paths
         @_all_autoload_paths ||= begin
-          autoload_paths  = config.autoload_paths
-          autoload_paths += config.eager_load_paths
-          autoload_paths -= config.autoload_once_paths
+          autoload_paths  = config.all_autoload_paths
+          autoload_paths += config.all_eager_load_paths
+          autoload_paths -= config.all_autoload_once_paths
           autoload_paths.uniq
         end
       end

data/lib/rails/gem_version.rb

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

data/lib/rails/generators/app_base.rb

@@ -674,19 +674,7 @@ module Rails
       end
 
       def run_bundle
-        if bundle_install?
-          bundle_command("install", "BUNDLE_IGNORE_MESSAGES" => "1")
-
-          # The vast majority of Rails apps will be deployed on `x86_64-linux`.
-          platforms = ["--add-platform=x86_64-linux"]
-
-          # Users that develop on M1 mac may use docker and would need `aarch64-linux` as well.
-          platforms << "--add-platform=aarch64-linux" if RUBY_PLATFORM.start_with?("arm64")
-
-          platforms.each do |platform|
-            bundle_command("lock #{platform}", "BUNDLE_IGNORE_MESSAGES" => "1")
-          end
-        end
+        bundle_command("install", "BUNDLE_IGNORE_MESSAGES" => "1") if bundle_install?
       end
 
       def run_javascript
@@ -716,6 +704,16 @@ module Rails
         end
       end
 
+      def add_bundler_platforms
+        if bundle_install?
+          # The vast majority of Rails apps will be deployed on `x86_64-linux`.
+          bundle_command("lock --add-platform=x86_64-linux")
+
+          # Users that develop on M1 mac may use docker and would need `aarch64-linux` as well.
+          bundle_command("lock --add-platform=aarch64-linux") if RUBY_PLATFORM.start_with?("arm64")
+        end
+      end
+
       def generate_bundler_binstub
         if bundle_install?
           bundle_command("binstubs bundler")

data/lib/rails/generators/base.rb

@@ -79,7 +79,7 @@ module Rails
       #
       # For example, if the user invoke the controller generator as:
       #
-      #   bin/rails generate controller Account --test-framework=test_unit
+      #   $ bin/rails generate controller Account --test-framework=test_unit
       #
       # The controller generator will then try to invoke the following generators:
       #
@@ -134,11 +134,11 @@ module Rails
       # All hooks come with switches for user interface. If you do not want
       # to use any test framework, you can do:
       #
-      #   bin/rails generate controller Account --skip-test-framework
+      #   $ bin/rails generate controller Account --skip-test-framework
       #
       # Or similarly:
       #
-      #   bin/rails generate controller Account --no-test-framework
+      #   $ bin/rails generate controller Account --no-test-framework
       #
       # ==== Boolean hooks
       #
@@ -150,7 +150,7 @@ module Rails
       #
       # Then, if you want webrat to be invoked, just supply:
       #
-      #   bin/rails generate controller Account --webrat
+      #   $ bin/rails generate controller Account --webrat
       #
       # The hooks lookup is similar as above:
       #
@@ -222,7 +222,7 @@ module Rails
       end
 
       # Returns the default source root for a given generator. This is used internally
-      # by rails to set its generators source root. If you want to customize your source
+      # by \Rails to set its generators source root. If you want to customize your source
       # root, you should use source_root.
       def self.default_source_root
         return unless base_name && generator_name

data/lib/rails/generators/rails/app/app_generator.rb

@@ -172,10 +172,6 @@ module Rails
           remove_file "config/initializers/permissions_policy.rb"
         end
       end
-
-      if !skip_sprockets?
-        insert_into_file "config/application.rb", %(require "sprockets/railtie"), after: /require\(["']rails\/all["']\)\n/
-      end
     end
 
     def master_key
@@ -547,6 +543,7 @@ module Rails
 
       public_task :apply_rails_template
       public_task :run_bundle
+      public_task :add_bundler_platforms
       public_task :generate_bundler_binstub
       public_task :run_javascript
       public_task :run_hotwire

data/lib/rails/generators/rails/app/templates/Gemfile.tt

@@ -50,8 +50,8 @@ group :development do
 <%- end -%>
   # Speed up commands on slow machines / big apps [https://github.com/rails/spring]
   # gem "spring"
-
 <%- if RUBY_VERSION >= "3.1" && RUBY_VERSION < "3.2" -%>
+
   gem "error_highlight", ">= 0.4.0", platforms: [:ruby]
 <%- end -%>
 end

data/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt

@@ -13,7 +13,7 @@ Rails.application.configure do
   config.eager_load = true
 
   # Full error reports are disabled and caching is turned on.
-  config.consider_all_requests_local       = false
+  config.consider_all_requests_local = false
   <%- unless options.api? -%>
   config.action_controller.perform_caching = true
   <%- end -%>
@@ -22,14 +22,14 @@ Rails.application.configure do
   # key such as config/credentials/production.key. This key is used to decrypt credentials (and other encrypted files).
   # config.require_master_key = true
 
-  # Enable static file serving from the `/public` folder (turn off if using NGINX/Apache for it).
-  config.public_file_server.enabled = true
+  # Disable serving static files from `public/`, relying on NGINX/Apache to do so instead.
+  # config.public_file_server.enabled = false
 
   <%- unless skip_sprockets? -%>
   # Compress CSS using a preprocessor.
   # config.assets.css_compressor = :sass
 
-  # Do not fallback to assets pipeline if a precompiled asset is missed.
+  # Do not fall back to assets pipeline if a precompiled asset is missed.
   config.assets.compile = false
 
   <%- end -%>
@@ -67,7 +67,7 @@ Rails.application.configure do
   # Prepend all log lines with the following tags.
   config.log_tags = [ :request_id ]
 
-  # Info include generic and useful information about system operation, but avoids logging too much
+  # "info" includes generic and useful information about system operation, but avoids logging too much
   # information to avoid inadvertent exposure of personally identifiable information (PII). If you
   # want to log everything, set the level to "debug".
   config.log_level = ENV.fetch("RAILS_LOG_LEVEL", "info")
@@ -77,7 +77,7 @@ Rails.application.configure do
 
   <%- unless options[:skip_active_job] -%>
   # Use a real queuing backend for Active Job (and separate queues per environment).
-  # config.active_job.queue_adapter     = :resque
+  # config.active_job.queue_adapter = :resque
   # config.active_job.queue_name_prefix = "<%= app_name %>_production"
 
   <%- end -%>

data/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt

@@ -24,11 +24,11 @@ Rails.application.configure do
   }
 
   # Show full error reports and disable caching.
-  config.consider_all_requests_local       = true
+  config.consider_all_requests_local = true
   config.action_controller.perform_caching = false
   config.cache_store = :null_store
 
-  # Raise exceptions instead of rendering exception templates.
+  # Render exception templates for rescuable exceptions and raise for other exceptions.
   config.action_dispatch.show_exceptions = :rescuable
 
   # Disable request forgery protection in test environment.

data/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults_7_1.rb.tt

@@ -9,14 +9,20 @@
 # Read the Guide for Upgrading Ruby on Rails for more info on each option.
 # https://guides.rubyonrails.org/upgrading_ruby_on_rails.html
 
+###
 # No longer add autoloaded paths into `$LOAD_PATH`. This means that you won't be able
 # to manually require files that are managed by the autoloader, which you shouldn't do anyway.
+#
 # This will reduce the size of the load path, making `require` faster if you don't use bootsnap, or reduce the size
 # of the bootsnap cache if you use it.
-# Rails.application.config.add_autoload_paths_to_load_path = false
+#
+# To set this configuration, add the following line to `config/application.rb` (NOT this file):
+#   config.add_autoload_paths_to_load_path = false
 
+###
 # Remove the default X-Download-Options headers since it is used only by Internet Explorer.
 # If you need to support Internet Explorer, add back `"X-Download-Options" => "noopen"`.
+#++
 # Rails.application.config.action_dispatch.default_headers = {
 #   "X-Frame-Options" => "SAMEORIGIN",
 #   "X-XSS-Protection" => "0",
@@ -25,31 +31,43 @@
 #   "Referrer-Policy" => "strict-origin-when-cross-origin"
 # }
 
+###
 # Do not treat an `ActionController::Parameters` instance
 # as equal to an equivalent `Hash` by default.
+#++
 # Rails.application.config.action_controller.allow_deprecated_parameters_hash_equality = false
 
-# Active Record Encryption now uses SHA-256 as its hash digest algorithm. Important: If you have
-# data encrypted with previous Rails versions, there are two scenarios to consider:
+###
+# Active Record Encryption now uses SHA-256 as its hash digest algorithm.
+#
+# There are 3 scenarios to consider.
 #
-# 1. If you have +config.active_support.key_generator_hash_digest_class+ configured as SHA1 (the default
+# 1. If you have data encrypted with previous Rails versions, and you have
+# +config.active_support.key_generator_hash_digest_class+ configured as SHA1 (the default
 # before Rails 7.0), you need to configure SHA-1 for Active Record Encryption too:
+#++
 # Rails.application.config.active_record.encryption.hash_digest_class = OpenSSL::Digest::SHA1
+#
 # 2. If you have +config.active_support.key_generator_hash_digest_class+ configured as SHA256 (the new default
 # in 7.0), then you need to configure SHA-256 for Active Record Encryption:
+#++
 # Rails.application.config.active_record.encryption.hash_digest_class = OpenSSL::Digest::SHA256
 #
-# If you don't currently have data encrypted with Active Record encryption, you can disable this setting to
+# 3. If you don't currently have data encrypted with Active Record encryption, you can disable this setting to
 # configure the default behavior starting 7.1+:
+#++
 # Rails.application.config.active_record.encryption.support_sha1_for_non_deterministic_encryption = false
 
+###
 # No longer run after_commit callbacks on the first of multiple Active Record
 # instances to save changes to the same database row within a transaction.
 # Instead, run these callbacks on the instance most likely to have internal
 # state which matches what was committed to the database, typically the last
 # instance to save.
+#++
 # Rails.application.config.active_record.run_commit_callbacks_on_first_saved_instances_in_transaction = false
 
+###
 # Configures SQLite with a strict strings mode, which disables double-quoted string literals.
 #
 # SQLite has some quirks around double-quoted string literals.
@@ -57,11 +75,15 @@
 # it then considers them as string literals. Because of this, typos can silently go unnoticed.
 # For example, it is possible to create an index for a non existing column.
 # See https://www.sqlite.org/quirks.html#double_quoted_string_literals_are_accepted for more details.
+#++
 # Rails.application.config.active_record.sqlite3_adapter_strict_strings_by_default = true
 
-# Disable deprecated singular associations names
+###
+# Disable deprecated singular associations names.
+#++
 # Rails.application.config.active_record.allow_deprecated_singular_associations_name = false
 
+###
 # Enable the Active Job `BigDecimal` argument serializer, which guarantees
 # roundtripping. Without this serializer, some queue adapters may serialize
 # `BigDecimal` arguments as simple (non-roundtrippable) strings.
@@ -70,19 +92,25 @@
 # replicas will not be able to deserialize `BigDecimal` arguments from this
 # serializer. Therefore, this setting should only be enabled after all replicas
 # have been successfully upgraded to Rails 7.1.
+#++
 # Rails.application.config.active_job.use_big_decimal_serializer = true
 
+###
 # Specify if an `ArgumentError` should be raised if `Rails.cache` `fetch` or
 # `write` are given an invalid `expires_at` or `expires_in` time.
 # Options are `true`, and `false`. If `false`, the exception will be reported
 # as `handled` and logged instead.
+#++
 # Rails.application.config.active_support.raise_on_invalid_cache_expiration_time = true
 
+###
 # Specify whether Query Logs will format tags using the SQLCommenter format
 # (https://open-telemetry.github.io/opentelemetry-sqlcommenter/), or using the legacy format.
 # Options are `:legacy` and `:sqlcommenter`.
+#++
 # Rails.application.config.active_record.query_log_tags_format = :sqlcommenter
 
+###
 # Specify the default serializer used by `MessageEncryptor` and `MessageVerifier`
 # instances.
 #
@@ -109,8 +137,10 @@
 # that have not yet been upgraded must be able to read messages from upgraded
 # servers, first deploy without changing the serializer, then set the serializer
 # in a subsequent deploy.
+#++
 # Rails.application.config.active_support.message_serializer = :json_allow_marshal
 
+###
 # Enable a performance optimization that serializes message data and metadata
 # together. This changes the message format, so messages serialized this way
 # cannot be read by older versions of Rails. However, messages that use the old
@@ -120,42 +150,55 @@
 # not yet been upgraded must be able to read messages from upgraded servers,
 # leave this optimization off on the first deploy, then enable it on a
 # subsequent deploy.
+#++
 # Rails.application.config.active_support.use_message_serializer_for_metadata = true
 
+###
 # Set the maximum size for Rails log files.
 #
 # `config.load_defaults 7.1` does not set this value for environments other than
 # development and test.
-#
+#++
 # if Rails.env.local?
 #   Rails.application.config.log_file_size = 100 * 1024 * 1024
 # end
 
+###
 # Enable raising on assignment to attr_readonly attributes. The previous
 # behavior would allow assignment but silently not persist changes to the
 # database.
+#++
 # Rails.application.config.active_record.raise_on_assign_to_attr_readonly = true
 
+###
 # Enable validating only parent-related columns for presence when the parent is mandatory.
 # The previous behavior was to validate the presence of the parent record, which performed an extra query
 # to get the parent every time the child record was updated, even when parent has not changed.
+#++
 # Rails.application.config.active_record.belongs_to_required_validates_foreign_key = false
 
+###
 # Enable precompilation of `config.filter_parameters`. Precompilation can
 # improve filtering performance, depending on the quantity and types of filters.
+#++
 # Rails.application.config.precompile_filter_parameters = true
 
+###
 # Enable before_committed! callbacks on all enrolled records in a transaction.
 # The previous behavior was to only run the callbacks on the first copy of a record
 # if there were multiple copies of the same record enrolled in the transaction.
+#++
 # Rails.application.config.active_record.before_committed_on_all_records = true
 
+###
 # Disable automatic column serialization into YAML.
 # To keep the historic behavior, you can set it to `YAML`, however it is
 # recommended to explicitly define the serialization method for each column
 # rather than to rely on a global default.
+#++
 # Rails.application.config.active_record.default_column_serializer = nil
 
+###
 # Enable a performance optimization that serializes Active Record models
 # in a faster and more compact way.
 #
@@ -163,32 +206,43 @@
 # not yet been upgraded must be able to read caches from upgraded servers,
 # leave this optimization off on the first deploy, then enable it on a
 # subsequent deploy.
+#++
 # Rails.application.config.active_record.marshalling_format_version = 7.1
 
+###
 # Run `after_commit` and `after_*_commit` callbacks in the order they are defined in a model.
 # This matches the behaviour of all other callbacks.
 # In previous versions of Rails, they ran in the inverse order.
+#++
 # Rails.application.config.active_record.run_after_transaction_callbacks_in_order_defined = true
 
+###
 # Whether a `transaction` block is committed or rolled back when exited via `return`, `break` or `throw`.
-#
+#++
 # Rails.application.config.active_record.commit_transaction_on_non_local_return = true
 
+###
 # Controls when to generate a value for <tt>has_secure_token</tt> declarations.
-#
+#++
 # Rails.application.config.active_record.generate_secure_token_on = :initialize
 
+###
 # ** Please read carefully, this must be configured in config/application.rb **
+#
 # Change the format of the cache entry.
+#
 # Changing this default means that all new cache entries added to the cache
 # will have a different format that is not supported by Rails 7.0
 # applications.
+#
 # Only change this value after your application is fully deployed to Rails 7.1
 # and you have no plans to rollback.
 # When you're ready to change format, add this to `config/application.rb` (NOT
 # this file):
 #   config.active_support.cache_format_version = 7.1
 
+
+###
 # Configure Action View to use HTML5 standards-compliant sanitizers when they are supported on your
 # platform.
 #
@@ -196,9 +250,11 @@
 # sanitizers if they are supported, else fall back to HTML4 sanitizers.
 #
 # In previous versions of Rails, Action View always used `Rails::HTML4::Sanitizer` as its vendor.
-#
+#++
 # Rails.application.config.action_view.sanitizer_vendor = Rails::HTML::Sanitizer.best_supported_vendor
 
+
+###
 # Configure Action Text to use an HTML5 standards-compliant sanitizer when it is supported on your
 # platform.
 #
@@ -206,18 +262,23 @@
 # sanitizers if they are supported, else fall back to HTML4 sanitizers.
 #
 # In previous versions of Rails, Action Text always used `Rails::HTML4::Sanitizer` as its vendor.
-#
+#++
 # Rails.application.config.action_text.sanitizer_vendor = Rails::HTML::Sanitizer.best_supported_vendor
 
+
+###
 # Configure the log level used by the DebugExceptions middleware when logging
-# uncaught exceptions during requests
+# uncaught exceptions during requests.
+#++
 # Rails.application.config.action_dispatch.debug_exception_log_level = :error
 
+
+###
 # Configure the test helpers in Action View, Action Dispatch, and rails-dom-testing to use HTML5
 # parsers.
 #
 # Nokogiri::HTML5 isn't supported on JRuby, so JRuby applications must set this to :html4.
 #
 # In previous versions of Rails, these test helpers always used an HTML4 parser.
-#
+#++
 # Rails.application.config.dom_testing_default_html_version = :html5

data/lib/rails/generators/rails/db/system/change/change_generator.rb

@@ -41,6 +41,9 @@ module Rails
           end
 
           def edit_dockerfile
+            dockerfile_path = File.expand_path("Dockerfile", destination_root)
+            return unless File.exist?(dockerfile_path)
+
             build_name = docker_for_database_build
             deploy_name = docker_for_database_deploy
             if build_name

data/lib/rails/generators.rb

@@ -90,7 +90,7 @@ module Rails
       end
 
       # Hold configured generators fallbacks. If a plugin developer wants a
-      # generator group to fallback to another group in case of missing generators,
+      # 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

data/lib/rails/tasks/zeitwerk.rake

@@ -1,11 +1,8 @@
 # frozen_string_literal: true
 
-eager_load = ->() do
-  puts "Hold on, I am eager loading the application."
-  Zeitwerk::Loader.eager_load_all
-end
+require "rails/zeitwerk_checker"
 
-report_not_checked = ->(not_checked) do
+report_unchecked = ->(unchecked) do
   puts
   puts <<~EOS
     WARNING: The following directories will only be checked if you configure
@@ -13,7 +10,7 @@ report_not_checked = ->(not_checked) do
   EOS
   puts
 
-  not_checked.each { |dir| puts "  #{dir}" }
+  unchecked.each { |dir| puts "  #{dir}" }
   puts
 
   puts <<~EOS
@@ -23,39 +20,22 @@ report_not_checked = ->(not_checked) do
   puts
 end
 
-report = ->(not_checked) do
-  if not_checked.any?
-    report_not_checked[not_checked]
-    puts "Otherwise, all is good!"
-  else
-    puts "All is good!"
-  end
-end
-
 namespace :zeitwerk do
   desc "Check project structure for Zeitwerk compatibility"
   task check: :environment do
+    puts "Hold on, I am eager loading the application."
+
     begin
-      eager_load[]
-    rescue NameError => e
-      if e.message =~ /expected file .*? to define constant [\w:]+/
-        abort $&.sub(/expected file #{Regexp.escape(Rails.root.to_s)}./, "expected file ")
-      else
-        raise
-      end
+      unchecked = Rails::ZeitwerkChecker.check
+    rescue Zeitwerk::NameError => e
+      abort e.message.sub(/#{Regexp.escape(Rails.root.to_s)}./, "")
     end
 
-    require "active_support/core_ext/object/try"
-    eager_load_paths = Rails.configuration.eager_load_namespaces.filter_map do |eln|
-      # Quick regression fix for 6.0.3 to support namespaces that do not have
-      # eager load paths, like the recently added i18n. I'll rewrite this task.
-      eln.try(:config).try(:eager_load_paths)
-    end.flatten
-
-    not_checked = ActiveSupport::Dependencies.autoload_paths - eager_load_paths
-    not_checked.select! { |dir| Dir.exist?(dir) }
-    not_checked.reject! { |dir| Dir.empty?(dir) }
-
-    report[not_checked]
+    if unchecked.empty?
+      puts "All is good!"
+    else
+      report_unchecked[unchecked]
+      puts "Otherwise, all is good!"
+    end
   end
 end

data/lib/rails/templates/rails/mailers/email.html.erb

@@ -44,6 +44,13 @@
     content: "\00a0"; //  
   }
 
+  th {
+    font-weight: inherit;
+    color: #7f7f7f;
+    text-align: right;
+    white-space: nowrap;
+  }
+
   iframe {
     border: 0;
     width: 100%;
@@ -134,7 +141,7 @@
           <table>
           <% @email.header_fields.each do |field| %>
             <tr>
-              <td align="right" style="color: #7f7f7f"><%= field.name %>:</td>
+              <th><%= field.name %>:</th>
               <td><%= field.value %></td>
             </tr>
           <% end %>

data/lib/rails/zeitwerk_checker.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+# The actual (private) implementation of the Rake task zeitwerk:check.
+class Rails::ZeitwerkChecker # :nodoc:
+  def self.check
+    Zeitwerk::Loader.eager_load_all
+
+    autoloaded = ActiveSupport::Dependencies.autoload_paths + ActiveSupport::Dependencies.autoload_once_paths
+    eager_loaded = ActiveSupport::Dependencies._eager_load_paths.to_a
+
+    unchecked = autoloaded - eager_loaded
+    unchecked.select! { |dir| Dir.exist?(dir) && !Dir.empty?(dir)  }
+    unchecked
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: railties
 version: !ruby/object:Gem::Version
-  version: 7.1.1
+  version: 7.1.3
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-11 00:00:00.000000000 Z
+date: 2024-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.1
+        version: 7.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.1
+        version: 7.1.3
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.1
+        version: 7.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.1
+        version: 7.1.3
 - !ruby/object:Gem::Dependency
   name: rackup
   requirement: !ruby/object:Gem::Requirement
@@ -120,14 +120,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.1
+        version: 7.1.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.1
+        version: 7.1.3
 description: 'Rails internals: application bootup, plugins, generators, and rake tasks.'
 email: david@loudthinking.com
 executables:
@@ -453,15 +453,16 @@ files:
 - lib/rails/testing/maintain_test_schema.rb
 - lib/rails/version.rb
 - lib/rails/welcome_controller.rb
+- lib/rails/zeitwerk_checker.rb
 homepage: https://rubyonrails.org
 licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v7.1.1/railties/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v7.1.1/
+  changelog_uri: https://github.com/rails/rails/blob/v7.1.3/railties/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v7.1.3/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v7.1.1/railties
+  source_code_uri: https://github.com/rails/rails/tree/v7.1.3/railties
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: