diff options
| author | Joshua Peek <josh@joshpeek.com> | 2011-04-12 21:56:00 -0500 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2011-04-12 21:56:00 -0500 |
| commit | ed24595647374885cebc1d43badc174c0991e93a (patch) | |
| tree | 020a8c856c264ed34deb872e54cf447e2fd872a3 /actionpack/test/fixtures | |
| parent | d7b521db1297c1b95a441b3928fc31ab3abd5ed5 (diff) | |
| parent | f0e198bfa1e3f9689e0cde1d194a44027fc90b3c (diff) | |
| download | rails-ed24595647374885cebc1d43badc174c0991e93a.tar.gz rails-ed24595647374885cebc1d43badc174c0991e93a.tar.bz2 rails-ed24595647374885cebc1d43badc174c0991e93a.zip | |
Merge branch 'master' into sprockets
Diffstat (limited to 'actionpack/test/fixtures')
| -rw-r--r-- | actionpack/test/fixtures/respond_with/using_invalid_resource_with_template.xml.erb | 1 | ||||
| -rw-r--r-- | actionpack/test/fixtures/respond_with/using_options_with_template.xml.erb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/test/fixtures/respond_with/using_invalid_resource_with_template.xml.erb b/actionpack/test/fixtures/respond_with/using_invalid_resource_with_template.xml.erb new file mode 100644 index 0000000000..bf5869ed22 --- /dev/null +++ b/actionpack/test/fixtures/respond_with/using_invalid_resource_with_template.xml.erb @@ -0,0 +1 @@ +<content>I should not be displayed</content>
\ No newline at end of file diff --git a/actionpack/test/fixtures/respond_with/using_options_with_template.xml.erb b/actionpack/test/fixtures/respond_with/using_options_with_template.xml.erb new file mode 100644 index 0000000000..b313017913 --- /dev/null +++ b/actionpack/test/fixtures/respond_with/using_options_with_template.xml.erb @@ -0,0 +1 @@ +<customer-name><%= @customer.name %></customer-name>
\ No newline at end of file |