aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/new_base
diff options
context:
space:
mode:
authorPablo Ifran <pabloifran@gmail.com>2012-01-02 09:16:38 -0200
committerPablo Ifran <pabloifran@gmail.com>2012-01-02 09:16:38 -0200
commitc8fe025965ceea0618ee7b620ca04ca8545d210b (patch)
tree3d0b83dc449d6170ede097c919430ce1cfb27607 /actionpack/test/controller/new_base
parent24b1fd21f0390bdf4d0dc96a14abc17a7a24219d (diff)
parentdc64aec7fa54cb34353f0c476136abf4191273fc (diff)
downloadrails-c8fe025965ceea0618ee7b620ca04ca8545d210b.tar.gz
rails-c8fe025965ceea0618ee7b620ca04ca8545d210b.tar.bz2
rails-c8fe025965ceea0618ee7b620ca04ca8545d210b.zip
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'actionpack/test/controller/new_base')
-rw-r--r--actionpack/test/controller/new_base/render_streaming_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/controller/new_base/render_streaming_test.rb b/actionpack/test/controller/new_base/render_streaming_test.rb
index 1a17e24914..1532bd5c98 100644
--- a/actionpack/test/controller/new_base/render_streaming_test.rb
+++ b/actionpack/test/controller/new_base/render_streaming_test.rb
@@ -111,4 +111,4 @@ module RenderStreaming
assert_equal cache, headers["Cache-Control"]
end
end
-end if defined?(Fiber)
+end