aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2015-08-26 10:45:51 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2015-08-26 10:51:13 -0700
commitab0703eb59d42e2572a9cffbda5a63d5780f6ed4 (patch)
tree59a676a9a6ad56ddd7fe164f0bc41280fbef3d86 /actionpack/lib
parenta50d55a7eee89dbbcf831c3717d9837462f7a70f (diff)
downloadrails-ab0703eb59d42e2572a9cffbda5a63d5780f6ed4.tar.gz
rails-ab0703eb59d42e2572a9cffbda5a63d5780f6ed4.tar.bz2
rails-ab0703eb59d42e2572a9cffbda5a63d5780f6ed4.zip
remove useless conditional
we always have a response object, so there is no reason to test it
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_controller/metal/head.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/head.rb b/actionpack/lib/action_controller/metal/head.rb
index 7dbd5ef328..74c1f314b1 100644
--- a/actionpack/lib/action_controller/metal/head.rb
+++ b/actionpack/lib/action_controller/metal/head.rb
@@ -45,7 +45,7 @@ module ActionController
if include_content?(self.response_code)
self.content_type = content_type || (Mime[formats.first] if formats)
- self.response.charset = false if self.response
+ self.response.charset = false
end
true