diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2006-06-29 01:54:16 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2006-06-29 01:54:16 +0000 |
| commit | 1fd9a46d713a4b314621bd7cf171bd048b10741f (patch) | |
| tree | 86f5aa702b43bacee7a3f982b191dac5f4ec7d3c /actionmailer/test/fixtures | |
| parent | 5b866f75a7ba5970a51a91cf643d03cc89f5c4c3 (diff) | |
| download | rails-1fd9a46d713a4b314621bd7cf171bd048b10741f.tar.gz rails-1fd9a46d713a4b314621bd7cf171bd048b10741f.tar.bz2 rails-1fd9a46d713a4b314621bd7cf171bd048b10741f.zip | |
Resolve conflict among mailer actions with the same name. Closes #5520.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4509 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionmailer/test/fixtures')
4 files changed, 3 insertions, 1 deletions
diff --git a/actionmailer/test/fixtures/first_mailer/share.rhtml b/actionmailer/test/fixtures/first_mailer/share.rhtml new file mode 100644 index 0000000000..da43638ceb --- /dev/null +++ b/actionmailer/test/fixtures/first_mailer/share.rhtml @@ -0,0 +1 @@ +first mail diff --git a/actionmailer/test/fixtures/path.with.dots/funky_path_mailer/multipart_with_template_path_with_dots.rhtml b/actionmailer/test/fixtures/path.with.dots/funky_path_mailer/multipart_with_template_path_with_dots.rhtml new file mode 100644 index 0000000000..897a5065cf --- /dev/null +++ b/actionmailer/test/fixtures/path.with.dots/funky_path_mailer/multipart_with_template_path_with_dots.rhtml @@ -0,0 +1 @@ +Have a lovely picture, from me. Enjoy!
\ No newline at end of file diff --git a/actionmailer/test/fixtures/path.with.dots/multipart_with_template_path_with_dots.rhtml b/actionmailer/test/fixtures/path.with.dots/multipart_with_template_path_with_dots.rhtml index 897a5065cf..e69de29bb2 100644 --- a/actionmailer/test/fixtures/path.with.dots/multipart_with_template_path_with_dots.rhtml +++ b/actionmailer/test/fixtures/path.with.dots/multipart_with_template_path_with_dots.rhtml @@ -1 +0,0 @@ -Have a lovely picture, from me. Enjoy!
\ No newline at end of file diff --git a/actionmailer/test/fixtures/second_mailer/share.rhtml b/actionmailer/test/fixtures/second_mailer/share.rhtml new file mode 100644 index 0000000000..9a54010672 --- /dev/null +++ b/actionmailer/test/fixtures/second_mailer/share.rhtml @@ -0,0 +1 @@ +second mail |