diff options
| author | Yuji Yaginuma <yuuji.yaginuma@gmail.com> | 2019-06-21 09:04:30 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-21 09:04:30 +0900 |
| commit | c631e8d011a7cf3e7ade4e9e8db56d2b89bd530c (patch) | |
| tree | ce404d935851ec89e426e7538067276cc5a7e885 /railties/lib | |
| parent | 3218459c28737071fe4424cd375c1b06a5c317df (diff) | |
| parent | ddb6d788d6a611fd1ba6cf92ad6d1342079517a8 (diff) | |
| download | rails-c631e8d011a7cf3e7ade4e9e8db56d2b89bd530c.tar.gz rails-c631e8d011a7cf3e7ade4e9e8db56d2b89bd530c.tar.bz2 rails-c631e8d011a7cf3e7ade4e9e8db56d2b89bd530c.zip | |
Merge pull request #36490 from y-yagi/revise_36034
Make `ActionDispatch::Response#content_type` behavior configurable
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/application/configuration.rb | 1 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults_6_0.rb.tt | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb index da1c433e52..72c7ff169f 100644 --- a/railties/lib/rails/application/configuration.rb +++ b/railties/lib/rails/application/configuration.rb @@ -129,6 +129,7 @@ module Rails if respond_to?(:action_dispatch) action_dispatch.use_cookies_with_metadata = true + action_dispatch.return_only_media_type_on_content_type = false end if respond_to?(:action_mailer) diff --git a/railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults_6_0.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults_6_0.rb.tt index d25552e923..abb03e761b 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults_6_0.rb.tt +++ b/railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults_6_0.rb.tt @@ -16,6 +16,9 @@ # It's best enabled when your entire app is migrated and stable on 6.0. # Rails.application.config.action_dispatch.use_cookies_with_metadata = true +# Change the return value of `ActionDispatch::Response#content_type` to Content-Type header without modification. +# Rails.application.config.action_dispatch.return_only_media_type_on_content_type = true + # Return false instead of self when enqueuing is aborted from a callback. # Rails.application.config.active_job.return_false_on_aborted_enqueue = true |