diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2008-08-28 11:36:56 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-08-28 11:36:56 +0100 |
| commit | 3e3945b2fafb9ccedfd9ff181c31b18f5d4cd0ce (patch) | |
| tree | cd86abce0ab9accbbbf24018961464590fa6bb39 /actionpack/test/fixtures | |
| parent | 5db2f199aba9aa8d00adefa8237922ad684aca03 (diff) | |
| parent | 96c6fe084228d570dad80e3100830edb2bc0448d (diff) | |
| download | rails-3e3945b2fafb9ccedfd9ff181c31b18f5d4cd0ce.tar.gz rails-3e3945b2fafb9ccedfd9ff181c31b18f5d4cd0ce.tar.bz2 rails-3e3945b2fafb9ccedfd9ff181c31b18f5d4cd0ce.zip | |
Merge commit 'mainstream/master'
Conflicts:
activerecord/lib/active_record/associations/association_proxy.rb
activerecord/lib/active_record/callbacks.rb
activeresource/lib/active_resource/base.rb
Diffstat (limited to 'actionpack/test/fixtures')
| -rw-r--r-- | actionpack/test/fixtures/test/_layout_for_block_with_args.html.erb | 3 | ||||
| -rw-r--r-- | actionpack/test/fixtures/test/using_layout_around_block_with_args.html.erb | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/actionpack/test/fixtures/test/_layout_for_block_with_args.html.erb b/actionpack/test/fixtures/test/_layout_for_block_with_args.html.erb new file mode 100644 index 0000000000..307533208d --- /dev/null +++ b/actionpack/test/fixtures/test/_layout_for_block_with_args.html.erb @@ -0,0 +1,3 @@ +Before +<%= yield 'arg1', 'arg2' %> +After
\ No newline at end of file diff --git a/actionpack/test/fixtures/test/using_layout_around_block_with_args.html.erb b/actionpack/test/fixtures/test/using_layout_around_block_with_args.html.erb new file mode 100644 index 0000000000..71b1f30ad0 --- /dev/null +++ b/actionpack/test/fixtures/test/using_layout_around_block_with_args.html.erb @@ -0,0 +1 @@ +<% render(:layout => "layout_for_block_with_args") do |*args| %><%= args.join %><% end %>
\ No newline at end of file |