aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2015-08-26 10:29:24 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2015-08-26 10:51:13 -0700
commit109fb8e7a94e2bebb1f7b628c2fd1b377f5601e2 (patch)
tree1b3c64c0b478ca9f2025583e64b6bc7c44347ce7 /actionpack/lib/action_controller
parent44454bdd8b08ca7f19f3974e6c7eb7f0fcbca590 (diff)
downloadrails-109fb8e7a94e2bebb1f7b628c2fd1b377f5601e2.tar.gz
rails-109fb8e7a94e2bebb1f7b628c2fd1b377f5601e2.tar.bz2
rails-109fb8e7a94e2bebb1f7b628c2fd1b377f5601e2.zip
remove useless conditional
We always have a response object in controller instances, so we can remove this conditional
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/metal.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal.rb b/actionpack/lib/action_controller/metal.rb
index 4392bc8266..81d46aa466 100644
--- a/actionpack/lib/action_controller/metal.rb
+++ b/actionpack/lib/action_controller/metal.rb
@@ -210,7 +210,7 @@ module ActionController
# Tests if render or redirect has already happened.
def performed?
- response_body || (response && response.committed?)
+ response_body || response.committed?
end
def dispatch(name, request, response) #:nodoc: