diff options
| author | Yuji Yaginuma <yuuji.yaginuma@gmail.com> | 2019-06-01 16:51:56 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-01 16:51:56 +0900 |
| commit | 2a015f6c0be0593a624b0c800e5335319ac4c660 (patch) | |
| tree | 76458f7e7c743bdee8d979a2af83494c21f636af /actionpack/lib/action_controller/metal.rb | |
| parent | d3e87efedb8cf9d072584bc8703841a80c07648f (diff) | |
| parent | ea5f509643d6d9c468a9b26f6c45bd4e40fd67cf (diff) | |
| download | rails-2a015f6c0be0593a624b0c800e5335319ac4c660.tar.gz rails-2a015f6c0be0593a624b0c800e5335319ac4c660.tar.bz2 rails-2a015f6c0be0593a624b0c800e5335319ac4c660.zip | |
Merge pull request #36034 from y-yagi/fixes_35709
Change `ActionDispatch::Response#content_type` returning Content-Type header as it is
Diffstat (limited to 'actionpack/lib/action_controller/metal.rb')
| -rw-r--r-- | actionpack/lib/action_controller/metal.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal.rb b/actionpack/lib/action_controller/metal.rb index b9088e6d86..9ca0bbb9db 100644 --- a/actionpack/lib/action_controller/metal.rb +++ b/actionpack/lib/action_controller/metal.rb @@ -148,7 +148,7 @@ module ActionController attr_internal :response, :request delegate :session, to: "@_request" delegate :headers, :status=, :location=, :content_type=, - :status, :location, :content_type, to: "@_response" + :status, :location, :content_type, :media_type, to: "@_response" def initialize @_request = nil |