Skip to content

Commit 676a7b0

Browse files
Merge pull request rails#45784 from skipkayhil/fixup-version-default-docs
Add missing and fix incorrect version defaults
2 parents 46c7420 + 8f9ec10 commit 676a7b0

File tree

2 files changed

+41
-40
lines changed

2 files changed

+41
-40
lines changed

guides/source/configuring.md

Lines changed: 40 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -60,86 +60,87 @@ Below are the default values associated with each target version. In cases of co
6060

6161
#### Default Values for Target Version 7.1
6262

63+
- [`config.action_controller.allow_deprecated_parameters_hash_equality`](#config-action-controller-allow-deprecated-parameters-hash-equality): `false`
6364
- [`config.action_dispatch.default_headers`](#config-action-dispatch-default-headers): `{ "X-Frame-Options" => "SAMEORIGIN", "X-XSS-Protection" => "0", "X-Content-Type-Options" => "nosniff", "X-Permitted-Cross-Domain-Policies" => "none", "Referrer-Policy" => "strict-origin-when-cross-origin" }`
64-
- [`config.add_autoload_paths_to_load_path`](#config-add-autoload-paths-to-load-path): `false`
65+
- [`config.active_job.use_big_decimal_serializer`](#config-active-job-use-big-decimal-serializer): `true`
66+
- [`config.active_record.allow_deprecated_singular_associations_name`](#config-active-record-allow-deprecated-singular-associations-name): `false`
67+
- [`config.active_record.run_commit_callbacks_on_first_saved_instances_in_transaction`](#config-active-record-run-commit-callbacks-on-first-saved-instances-in-transaction): `false`
68+
- [`config.active_record.sqlite3_adapter_strict_strings_by_default`](#config-active-record-sqlite3-adapter-strict-strings-by-default): `true`
6569
- [`config.active_support.default_message_encryptor_serializer`](#config-active-support-default-message-encryptor-serializer): `:json`
6670
- [`config.active_support.default_message_verifier_serializer`](#config-active-support-default-message-verifier-serializer): `:json`
67-
- [`config.action_controller.allow_deprecated_parameters_hash_equality`](#config-action-controller-allow-deprecated-parameters-hash-equality): `false`
68-
- [`config.log_file_size`](#config-log-file-size): `100.megabytes`
69-
- [`config.active_record.sqlite3_adapter_strict_strings_by_default`](#config-active-record-sqlite3-adapter-strict-strings-by-default): `false`
70-
- [`config.active_record.allow_deprecated_singular_associations_name`](#config-active-record-allow-deprecated-singular-associations-name): `false`
71-
- [`config.active_job.use_big_decimal_serializer`](#config-active-job-use-big-decimal-serializer): `false`
72-
71+
- [`config.add_autoload_paths_to_load_path`](#config-add-autoload-paths-to-load-path): `false`
72+
- [`config.log_file_size`](#config-log-file-size): `100 * 1024 * 1024`
7373

7474
#### Default Values for Target Version 7.0
7575

7676
- [`config.action_controller.raise_on_open_redirects`](#config-action-controller-raise-on-open-redirects): `true`
77-
- [`config.action_view.button_to_generates_button_tag`](#config-action-view-button-to-generates-button-tag): `true`
78-
- [`config.action_view.apply_stylesheet_media_default`](#config-action-view-apply-stylesheet-media-default): `false`
79-
- [`config.active_support.key_generator_hash_digest_class`](#config-active-support-key-generator-hash-digest-class): `OpenSSL::Digest::SHA256`
80-
- [`config.active_support.hash_digest_class`](#config-active-support-hash-digest-class): `OpenSSL::Digest::SHA256`
81-
- [`config.active_support.cache_format_version`](#config-active-support-cache-format-version): `7.0`
82-
- [`config.active_support.remove_deprecated_time_with_zone_name`](#config-active-support-remove-deprecated-time-with-zone-name): `true`
83-
- [`config.active_support.executor_around_test_case`](#config-active-support-executor-around-test-case): `true`
84-
- [`config.active_support.use_rfc4122_namespaced_uuids`](#config-active-support-use-rfc4122-namespaced-uuids): `true`
85-
- [`config.active_support.disable_to_s_conversion`](#config-active-support-disable-to-s-conversion): `true`
86-
- [`config.action_dispatch.return_only_request_media_type_on_content_type`](#config-action-dispatch-return-only-request-media-type-on-content-type): `false`
77+
- [`config.action_controller.wrap_parameters_by_default`](#config-action-controller-wrap-parameters-by-default): `true`
8778
- [`config.action_dispatch.cookies_serializer`](#config-action-dispatch-cookies-serializer): `:json`
79+
- [`config.action_dispatch.default_headers`](#config-action-dispatch-default-headers): `{ "X-Frame-Options" => "SAMEORIGIN", "X-XSS-Protection" => "0", "X-Content-Type-Options" => "nosniff", "X-Download-Options" => "noopen", "X-Permitted-Cross-Domain-Policies" => "none", "Referrer-Policy" => "strict-origin-when-cross-origin" }`
80+
- [`config.action_dispatch.return_only_request_media_type_on_content_type`](#config-action-dispatch-return-only-request-media-type-on-content-type): `false`
8881
- [`config.action_mailer.smtp_timeout`](#config-action-mailer-smtp-timeout): `5`
89-
- [`config.active_storage.video_preview_arguments`](#config-active-storage-video-preview-arguments): `"-vf 'select=eq(n\\,0)+eq(key\\,1)+gt(scene\\,0.015),loop=loop=-1:size=2,trim=start_frame=1' -frames:v 1 -f image2"`
90-
- [`config.active_storage.multiple_file_field_include_hidden`](#config-active-storage-multiple-file-field-include-hidden): `true`
82+
- [`config.action_view.apply_stylesheet_media_default`](#config-action-view-apply-stylesheet-media-default): `false`
83+
- [`config.action_view.button_to_generates_button_tag`](#config-action-view-button-to-generates-button-tag): `true`
9184
- [`config.active_record.automatic_scope_inversing`](#config-active-record-automatic-scope-inversing): `true`
92-
- [`config.active_record.verify_foreign_keys_for_fixtures`](#config-active-record-verify-foreign-keys-for-fixtures): `true`
9385
- [`config.active_record.partial_inserts`](#config-active-record-partial-inserts): `false`
86+
- [`config.active_record.verify_foreign_keys_for_fixtures`](#config-active-record-verify-foreign-keys-for-fixtures): `true`
87+
- [`config.active_storage.multiple_file_field_include_hidden`](#config-active-storage-multiple-file-field-include-hidden): `true`
9488
- [`config.active_storage.variant_processor`](#config-active-storage-variant-processor): `:vips`
95-
- [`config.action_controller.wrap_parameters_by_default`](#config-action-controller-wrap-parameters-by-default): `true`
96-
- [`config.action_dispatch.default_headers`](#config-action-dispatch-default-headers): `{ "X-Frame-Options" => "SAMEORIGIN", "X-XSS-Protection" => "0", "X-Content-Type-Options" => "nosniff", "X-Download-Options" => "noopen", "X-Permitted-Cross-Domain-Policies" => "none", "Referrer-Policy" => "strict-origin-when-cross-origin" }`
89+
- [`config.active_storage.video_preview_arguments`](#config-active-storage-video-preview-arguments): `"-vf 'select=eq(n\\,0)+eq(key\\,1)+gt(scene\\,0.015),loop=loop=-1:size=2,trim=start_frame=1' -frames:v 1 -f image2"`
90+
- [`config.active_support.cache_format_version`](#config-active-support-cache-format-version): `7.0`
91+
- [`config.active_support.disable_to_s_conversion`](#config-active-support-disable-to-s-conversion): `true`
92+
- [`config.active_support.executor_around_test_case`](#config-active-support-executor-around-test-case): `true`
93+
- [`config.active_support.hash_digest_class`](#config-active-support-hash-digest-class): `OpenSSL::Digest::SHA256`
94+
- [`config.active_support.isolation_level`](#config-active-support-isolation-level): `:thread`
95+
- [`config.active_support.key_generator_hash_digest_class`](#config-active-support-key-generator-hash-digest-class): `OpenSSL::Digest::SHA256`
96+
- [`config.active_support.remove_deprecated_time_with_zone_name`](#config-active-support-remove-deprecated-time-with-zone-name): `true`
97+
- [`config.active_support.use_rfc4122_namespaced_uuids`](#config-active-support-use-rfc4122-namespaced-uuids): `true`
9798

9899
#### Default Values for Target Version 6.1
99100

100-
- [`config.active_record.has_many_inversing`](#config-active-record-has-many-inversing): `true`
101-
- [`config.active_storage.track_variants`](#config-active-storage-track-variants): `true`
102-
- [`config.active_storage.queues.analysis`](#config-active-storage-queues-analysis): `nil`
103-
- [`config.active_storage.queues.purge`](#config-active-storage-queues-purge): `nil`
101+
- [`ActiveSupport.utc_to_local_returns_utc_offset_times`](#activesupport-utc-to-local-returns-utc-offset-times): `true`
102+
- [`config.action_dispatch.cookies_same_site_protection`](#config-action-dispatch-cookies-same-site-protection): `:lax`
103+
- [`config.action_dispatch.ssl_default_redirect_status`](#config-action-dispatch-ssl-default-redirect-status): `308`
104104
- [`config.action_mailbox.queues.incineration`](#config-action-mailbox-queues-incineration): `nil`
105105
- [`config.action_mailbox.queues.routing`](#config-action-mailbox-queues-routing): `nil`
106106
- [`config.action_mailer.deliver_later_queue_name`](#config-action-mailer-deliver-later-queue-name): `nil`
107-
- [`config.active_job.retry_jitter`](#config-active-job-retry-jitter): `0.15`
108-
- [`config.action_dispatch.cookies_same_site_protection`](#config-action-dispatch-cookies-same-site-protection): `:lax`
109-
- [`config.action_dispatch.ssl_default_redirect_status`](#config-action-dispatch-ssl-default-redirect-status) = `308`
110-
- [`ActiveSupport.utc_to_local_returns_utc_offset_times`](#activesupport-utc-to-local-returns-utc-offset-times): `true`
111107
- [`config.action_view.form_with_generates_remote_forms`](#config-action-view-form-with-generates-remote-forms): `false`
112108
- [`config.action_view.preload_links_header`](#config-action-view-preload-links-header): `true`
109+
- [`config.active_job.retry_jitter`](#config-active-job-retry-jitter): `0.15`
110+
- [`config.active_record.has_many_inversing`](#config-active-record-has-many-inversing): `true`
111+
- [`config.active_storage.queues.analysis`](#config-active-storage-queues-analysis): `nil`
112+
- [`config.active_storage.queues.purge`](#config-active-storage-queues-purge): `nil`
113+
- [`config.active_storage.track_variants`](#config-active-storage-track-variants): `true`
113114

114115
#### Default Values for Target Version 6.0
115116

116-
- [`config.action_view.default_enforce_utf8`](#config-action-view-default-enforce-utf8): `false`
117117
- [`config.action_dispatch.use_cookies_with_metadata`](#config-action-dispatch-use-cookies-with-metadata): `true`
118118
- [`config.action_mailer.delivery_job`](#config-action-mailer-delivery-job): `"ActionMailer::MailDeliveryJob"`
119+
- [`config.action_view.default_enforce_utf8`](#config-action-view-default-enforce-utf8): `false`
120+
- [`config.active_record.collection_cache_versioning`](#config-active-record-collection-cache-versioning): `true`
119121
- [`config.active_storage.queues.analysis`](#config-active-storage-queues-analysis): `:active_storage_analysis`
120122
- [`config.active_storage.queues.purge`](#config-active-storage-queues-purge): `:active_storage_purge`
121123
- [`config.active_storage.replace_on_assign_to_many`](#config-active-storage-replace-on-assign-to-many): `true`
122-
- [`config.active_record.collection_cache_versioning`](#config-active-record-collection-cache-versioning): `true`
123124

124125
#### Default Values for Target Version 5.2
125126

126-
- [`config.active_record.cache_versioning`](#config-active-record-cache-versioning): `true`
127-
- [`config.action_dispatch.use_authenticated_cookie_encryption`](#config-action-dispatch-use-authenticated-cookie-encryption): `true`
128-
- [`config.active_support.use_authenticated_message_encryption`](#config-active-support-use-authenticated-message-encryption): `true`
129-
- [`config.active_support.hash_digest_class`](#config-active-support-hash-digest-class): `OpenSSL::Digest::SHA1`
130127
- [`config.action_controller.default_protect_from_forgery`](#config-action-controller-default-protect-from-forgery): `true`
128+
- [`config.action_dispatch.use_authenticated_cookie_encryption`](#config-action-dispatch-use-authenticated-cookie-encryption): `true`
131129
- [`config.action_view.form_with_generates_ids`](#config-action-view-form-with-generates-ids): `true`
130+
- [`config.active_record.cache_versioning`](#config-active-record-cache-versioning): `true`
131+
- [`config.active_support.hash_digest_class`](#config-active-support-hash-digest-class): `OpenSSL::Digest::SHA1`
132+
- [`config.active_support.use_authenticated_message_encryption`](#config-active-support-use-authenticated-message-encryption): `true`
132133

133134
#### Default Values for Target Version 5.1
134135

135-
- [`config.assets.unknown_asset_fallback`](#config-assets-unknown-asset-fallback): `false`
136136
- [`config.action_view.form_with_generates_remote_forms`](#config-action-view-form-with-generates-remote-forms): `true`
137+
- [`config.assets.unknown_asset_fallback`](#config-assets-unknown-asset-fallback): `false`
137138

138139
#### Default Values for Target Version 5.0
139140

140-
- [`config.action_controller.per_form_csrf_tokens`](#config-action-controller-per-form-csrf-tokens): `true`
141-
- [`config.action_controller.forgery_protection_origin_check`](#config-action-controller-forgery-protection-origin-check): `true`
142141
- [`ActiveSupport.to_time_preserves_timezone`](#activesupport-to-time-preserves-timezone): `true`
142+
- [`config.action_controller.forgery_protection_origin_check`](#config-action-controller-forgery-protection-origin-check): `true`
143+
- [`config.action_controller.per_form_csrf_tokens`](#config-action-controller-per-form-csrf-tokens): `true`
143144
- [`config.active_record.belongs_to_required_by_default`](#config-active-record-belongs-to-required-by-default): `true`
144145
- [`config.ssl_options`](#config-ssl-options): `{ hsts: { subdomains: true } }`
145146

railties/lib/rails/application/configuration.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ def load_defaults(target_version)
273273
self.add_autoload_paths_to_load_path = false
274274

275275
if Rails.env.development? || Rails.env.test?
276-
self.log_file_size = (100 * 1024 * 1024)
276+
self.log_file_size = 100 * 1024 * 1024
277277
end
278278

279279
if respond_to?(:active_record)

0 commit comments

Comments
 (0)