diff options
| author | Łukasz Strzałkowski <lukasz.strzalkowski@gmail.com> | 2013-07-25 14:04:52 +0200 |
|---|---|---|
| committer | Łukasz Strzałkowski <lukasz.strzalkowski@gmail.com> | 2013-08-25 11:39:12 +0200 |
| commit | 839938e3deaa4b0f3c1f5e6b46e398a1a46ecf5b (patch) | |
| tree | 4929fe5d6be6f9234d9818fa97841731362c7b90 /actionpack | |
| parent | e9f06b2ac151be1957395076f55cbfa9979bf2a5 (diff) | |
| download | rails-839938e3deaa4b0f3c1f5e6b46e398a1a46ecf5b.tar.gz rails-839938e3deaa4b0f3c1f5e6b46e398a1a46ecf5b.tar.bz2 rails-839938e3deaa4b0f3c1f5e6b46e398a1a46ecf5b.zip | |
Revert "Move setting content_type to AV"
This reverts commit f4d602aff6cec80304b131ecfcc2676d0304f0cc.
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_controller/metal/rendering.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/metal/rendering.rb b/actionpack/lib/action_controller/metal/rendering.rb index cdc63d67a3..f0e8945f11 100644 --- a/actionpack/lib/action_controller/metal/rendering.rb +++ b/actionpack/lib/action_controller/metal/rendering.rb @@ -12,6 +12,7 @@ module ActionController def render(*args) #:nodoc: raise ::AbstractController::DoubleRenderError if response_body super + self.content_type ||= Mime[lookup_context.rendered_format].to_s response_body end |