aboutsummaryrefslogtreecommitdiffstats
path: root/actionview/lib/action_view/rendering.rb
diff options
context:
space:
mode:
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
commit839938e3deaa4b0f3c1f5e6b46e398a1a46ecf5b (patch)
tree4929fe5d6be6f9234d9818fa97841731362c7b90 /actionview/lib/action_view/rendering.rb
parente9f06b2ac151be1957395076f55cbfa9979bf2a5 (diff)
downloadrails-839938e3deaa4b0f3c1f5e6b46e398a1a46ecf5b.tar.gz
rails-839938e3deaa4b0f3c1f5e6b46e398a1a46ecf5b.tar.bz2
rails-839938e3deaa4b0f3c1f5e6b46e398a1a46ecf5b.zip
Revert "Move setting content_type to AV"
This reverts commit f4d602aff6cec80304b131ecfcc2676d0304f0cc.
Diffstat (limited to 'actionview/lib/action_view/rendering.rb')
-rw-r--r--actionview/lib/action_view/rendering.rb2
1 files changed, 0 insertions, 2 deletions
diff --git a/actionview/lib/action_view/rendering.rb b/actionview/lib/action_view/rendering.rb
index 0db469766c..e3d0beade3 100644
--- a/actionview/lib/action_view/rendering.rb
+++ b/actionview/lib/action_view/rendering.rb
@@ -82,8 +82,6 @@ module ActionView
super(*args, &block)
options = _normalize_render(*args, &block)
-
- self.content_type ||= Mime[lookup_context.rendered_format].to_s
self.response_body = render_to_body(options)
end