diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2008-08-14 16:31:14 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-08-14 16:31:14 +0100 |
| commit | 2ebe8d275efa53af967b09ad66dab68acc1aed98 (patch) | |
| tree | b0b3e42c277b213788b55558aef3579f4e242300 /actionpack/test/fixtures | |
| parent | 73ef94e9675ef6db85f18f1e3c70bf6ddfc1260a (diff) | |
| parent | 8cb14ee1203c9ed380c4b192e8730757a52d43cb (diff) | |
| download | rails-2ebe8d275efa53af967b09ad66dab68acc1aed98.tar.gz rails-2ebe8d275efa53af967b09ad66dab68acc1aed98.tar.bz2 rails-2ebe8d275efa53af967b09ad66dab68acc1aed98.zip | |
Merge commit 'mainstream/master'
Conflicts:
actionpack/lib/action_controller/request.rb
actionpack/lib/action_controller/resources.rb
Diffstat (limited to 'actionpack/test/fixtures')
| -rw-r--r-- | actionpack/test/fixtures/_top_level_partial.html.erb | 1 | ||||
| -rw-r--r-- | actionpack/test/fixtures/_top_level_partial_only.erb | 1 | ||||
| -rw-r--r-- | actionpack/test/fixtures/test/_counter.html.erb | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/actionpack/test/fixtures/_top_level_partial.html.erb b/actionpack/test/fixtures/_top_level_partial.html.erb new file mode 100644 index 0000000000..0b1c2e46e0 --- /dev/null +++ b/actionpack/test/fixtures/_top_level_partial.html.erb @@ -0,0 +1 @@ +top level partial html
\ No newline at end of file diff --git a/actionpack/test/fixtures/_top_level_partial_only.erb b/actionpack/test/fixtures/_top_level_partial_only.erb new file mode 100644 index 0000000000..44f25b61d0 --- /dev/null +++ b/actionpack/test/fixtures/_top_level_partial_only.erb @@ -0,0 +1 @@ +top level partial
\ No newline at end of file diff --git a/actionpack/test/fixtures/test/_counter.html.erb b/actionpack/test/fixtures/test/_counter.html.erb new file mode 100644 index 0000000000..fd245bfc70 --- /dev/null +++ b/actionpack/test/fixtures/test/_counter.html.erb @@ -0,0 +1 @@ +<%= counter_counter %>
\ No newline at end of file |