aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-04-16 12:25:21 +0200
committerJosé Valim <jose.valim@gmail.com>2011-04-16 12:25:21 +0200
commit0114dc38d5cfc347fdbbd9a9bf5e0226a5a4ed0a (patch)
tree084eef12a0e76a9ce4841065ff3b657fdbf1cb7d /actionpack
parent2bf0d9b06a5f87707b2321fe5b618eeec44c7ab6 (diff)
downloadrails-0114dc38d5cfc347fdbbd9a9bf5e0226a5a4ed0a.tar.gz
rails-0114dc38d5cfc347fdbbd9a9bf5e0226a5a4ed0a.tar.bz2
rails-0114dc38d5cfc347fdbbd9a9bf5e0226a5a4ed0a.zip
Fix CI test on 1.8
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_view/renderer/streaming_template_renderer.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/renderer/streaming_template_renderer.rb b/actionpack/lib/action_view/renderer/streaming_template_renderer.rb
index acc84a50e7..52f0e9f5bd 100644
--- a/actionpack/lib/action_view/renderer/streaming_template_renderer.rb
+++ b/actionpack/lib/action_view/renderer/streaming_template_renderer.rb
@@ -1,4 +1,7 @@
-require 'fiber'
+# 1.9 ships with Fibers but we need to require the extra
+# methods explicitly. We only load those extra methods if
+# Fiber is available in the first place.
+require 'fiber' if defined?(Fiber)
module ActionView
# Consider the following layout: