Merge pull request rails#46585 from sampatbadhe/patch-1

byroot · web-flow · commit d1eebcbd820b · 2022-11-26T09:52:54.000+01:00
Update load_defaults 7.1 to config.load_defaults 7.1 [ci-skip]
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
@@ -36,7 +36,7 @@
     config.active_record.belongs_to_required_validates_foreign_key = false
     ```
 
-    and will be disabled by default with `load_defaults 7.1`.
+    and will be disabled by default with `config.load_defaults 7.1`.
 
     *fatkodima*
 
diff --git a/railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults_7_1.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults_7_1.rb.tt
@@ -101,7 +101,7 @@
 
 # Set the maximum size for Rails log files.
 #
-# `load_defaults 7.1` does not set this value for environments other than
+# `config.load_defaults 7.1` does not set this value for environments other than
 # development and test.
 #
 # if Rails.env.development? || Rails.env.test?

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@`
`101`	`101`
`102`	`102`	`# Set the maximum size for Rails log files.`
`103`	`103`	`#`
`104`		-# `load_defaults 7.1` does not set this value for environments other than
	`104`	+# `config.load_defaults 7.1` does not set this value for environments other than
`105`	`105`	`# development and test.`
`106`	`106`	`#`
`107`	`107`	`# if Rails.env.development? \|\| Rails.env.test?`