aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2012-12-31 15:08:00 -0200
committerSantiago Pastorino <santiago@wyeworks.com>2012-12-31 15:08:00 -0200
commit348870d5c53c94eb02135c04297c18be60bd3bb0 (patch)
tree59773c8496352442f5ea67b817ab18d38e91fb63 /actionpack/lib/action_controller
parente48dc194231830f42f179704596b88215f062c23 (diff)
downloadrails-348870d5c53c94eb02135c04297c18be60bd3bb0.tar.gz
rails-348870d5c53c94eb02135c04297c18be60bd3bb0.tar.bz2
rails-348870d5c53c94eb02135c04297c18be60bd3bb0.zip
Revert "Merge pull request #8665 from senny/8661_should_not_append_charset_if_already_present"
This reverts commit e48dc194231830f42f179704596b88215f062c23, reversing changes made to d38c8caa48a732d41c7402a5e71deece4e313559.
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/metal/head.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/head.rb b/actionpack/lib/action_controller/metal/head.rb
index 4c61bbd6dc..671053566d 100644
--- a/actionpack/lib/action_controller/metal/head.rb
+++ b/actionpack/lib/action_controller/metal/head.rb
@@ -29,7 +29,6 @@ module ActionController
self.status = status
self.location = url_for(location) if location
self.content_type = content_type || (Mime[formats.first] if formats)
- self.response.charset = false if self.response
self.response_body = " "
end
end