aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/fixtures
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2011-07-23 13:50:34 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2011-10-13 13:36:20 -0700
commit8f11d53506ea7ef2fd4cd28581f5eedd9be9e570 (patch)
treed6cbe4ff8a077cb0d2b75a4e7add7422b313c9cc /actionpack/test/fixtures
parent74fbbf1ea0018042e8709b8ad13c44718da3fdc1 (diff)
downloadrails-8f11d53506ea7ef2fd4cd28581f5eedd9be9e570.tar.gz
rails-8f11d53506ea7ef2fd4cd28581f5eedd9be9e570.tar.bz2
rails-8f11d53506ea7ef2fd4cd28581f5eedd9be9e570.zip
Merge pull request #2219 from kommen/fix_fragment_caching_squashed
Fix fragment caching (squashed commits)
Diffstat (limited to 'actionpack/test/fixtures')
-rw-r--r--actionpack/test/fixtures/functional_caching/fragment_cached.html.erb1
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/test/fixtures/functional_caching/fragment_cached.html.erb b/actionpack/test/fixtures/functional_caching/fragment_cached.html.erb
index c479adb897..fa5e6bd318 100644
--- a/actionpack/test/fixtures/functional_caching/fragment_cached.html.erb
+++ b/actionpack/test/fixtures/functional_caching/fragment_cached.html.erb
@@ -1,2 +1,3 @@
Hello
<%= cache do %>This bit's fragment cached<% end %>
+<%= 'Ciao' %>