diff options
| author | Mark Longair <mhl@pobox.com> | 2013-05-28 14:39:09 +0100 |
|---|---|---|
| committer | Mark Longair <mhl@pobox.com> | 2013-05-28 14:39:09 +0100 |
| commit | c248356a8e8a13513827381977b24f7406f96a8c (patch) | |
| tree | a0b2210c5956d0da8ea534fe8b772cd776087460 /spec/fixtures/files/incoming-request-two-same-name.email | |
| parent | ed03c3ef55fd61b9be3578ee0c93767d2c218b53 (diff) | |
| parent | 011e55bd4acf4f3c9de91c5ed4c646e855f19c24 (diff) | |
Merge branch 'tmail-to-mail-tests' into rails-3-develop
This merge brings in a number of tests and fixes for the handling
of mail under Mail / Rails 3 instead of TMail / Rails 2.
Conflicts:
config/initializers/alaveteli.rb
Diffstat (limited to 'spec/fixtures/files/incoming-request-two-same-name.email')
| -rw-r--r-- | spec/fixtures/files/incoming-request-two-same-name.email | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/fixtures/files/incoming-request-two-same-name.email b/spec/fixtures/files/incoming-request-two-same-name.email index f1024d607..ecd322fe4 100644 --- a/spec/fixtures/files/incoming-request-two-same-name.email +++ b/spec/fixtures/files/incoming-request-two-same-name.email @@ -13,13 +13,13 @@ Content-Disposition: inline --Q68bSM7Ycu6FN28Q Content-Type: text/plain; charset=us-ascii -Content-Disposition: attachment; filename="hello.txt" +Content-Disposition: attachment; filename="hello-world.txt" Second hello --Q68bSM7Ycu6FN28Q Content-Type: text/plain; charset=us-ascii -Content-Disposition: attachment; filename="hello.txt" +Content-Disposition: attachment; filename="hello-world.txt" First hello |