aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/metal
diff options
context:
space:
mode:
authorŁukasz Strzałkowski <lukasz.strzalkowski@gmail.com>2013-07-23 18:50:22 +0200
committerŁukasz Strzałkowski <lukasz.strzalkowski@gmail.com>2013-08-25 11:39:11 +0200
commitcb2d671cb884a7cfeb991ce5af5d7e1047685dbd (patch)
tree90aec1f8fe301c87f240ce36660a41faeb5c38bf /actionpack/lib/action_controller/metal
parent0b4507a26f7c4807ea14ce70c41033c9868f83e3 (diff)
downloadrails-cb2d671cb884a7cfeb991ce5af5d7e1047685dbd.tar.gz
rails-cb2d671cb884a7cfeb991ce5af5d7e1047685dbd.tar.bz2
rails-cb2d671cb884a7cfeb991ce5af5d7e1047685dbd.zip
Move setting content_type to AV
Diffstat (limited to 'actionpack/lib/action_controller/metal')
-rw-r--r--actionpack/lib/action_controller/metal/rendering.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/rendering.rb b/actionpack/lib/action_controller/metal/rendering.rb
index f0e8945f11..cdc63d67a3 100644
--- a/actionpack/lib/action_controller/metal/rendering.rb
+++ b/actionpack/lib/action_controller/metal/rendering.rb
@@ -12,7 +12,6 @@ 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