diff options
author | Rafael França <rafaelmfranca@gmail.com> | 2018-07-31 15:54:23 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-31 15:54:23 -0400 |
commit | b66bf91316d6726be359331bcaf436df66a9d257 (patch) | |
tree | 53d6d50ec577a9c32c5d41f2abfc9730d7a843ef /actionpack/lib/action_controller/metal/head.rb | |
parent | 40ac706393568109d32f6c72f79fc09d22936e77 (diff) | |
parent | f4b57b904dd4b6f6b4db6ff397cab23463890cc0 (diff) | |
download | rails-b66bf91316d6726be359331bcaf436df66a9d257.tar.gz rails-b66bf91316d6726be359331bcaf436df66a9d257.tar.bz2 rails-b66bf91316d6726be359331bcaf436df66a9d257.zip |
Merge pull request #28937 from maclover7/jm-fix-28927
Default content type for `head` is `text/html`
Diffstat (limited to 'actionpack/lib/action_controller/metal/head.rb')
-rw-r--r-- | actionpack/lib/action_controller/metal/head.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/head.rb b/actionpack/lib/action_controller/metal/head.rb index bac9bc5e5f..3c84bebb85 100644 --- a/actionpack/lib/action_controller/metal/head.rb +++ b/actionpack/lib/action_controller/metal/head.rb @@ -38,7 +38,7 @@ module ActionController self.response_body = "" if include_content?(response_code) - self.content_type = content_type || (Mime[formats.first] if formats) + self.content_type = content_type || (Mime[formats.first] if formats) || Mime[:html] response.charset = false end |