diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2014-08-02 12:09:07 +0000 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2014-08-02 12:09:07 +0000 |
| commit | 3bf2a4c0d2e04545ea34b080ccad8c998783b259 (patch) | |
| tree | 6b2aad1865147b5c4eab569141f8db64de83e72d /actionpack/lib/action_controller | |
| parent | ea7fc2e7c0aba43b0c54309d292d982e52ee1b3d (diff) | |
| parent | d9bd75a0d85355b8d63e4003a76c6399f0dbce17 (diff) | |
| download | rails-3bf2a4c0d2e04545ea34b080ccad8c998783b259.tar.gz rails-3bf2a4c0d2e04545ea34b080ccad8c998783b259.tar.bz2 rails-3bf2a4c0d2e04545ea34b080ccad8c998783b259.zip | |
Merge branch 'master' of github.com:rails/docrails
Conflicts:
guides/source/testing.md
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/metal.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal.rb b/actionpack/lib/action_controller/metal.rb index 9a427ebfdb..bfbc15a901 100644 --- a/actionpack/lib/action_controller/metal.rb +++ b/actionpack/lib/action_controller/metal.rb @@ -182,7 +182,8 @@ module ActionController body = [body] unless body.nil? || body.respond_to?(:each) super end - + + # Tests if render or redirect has already happened. def performed? response_body || (response && response.committed?) end |