aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
Commit message (Collapse)AuthorAgeFilesLines
* Bring AM tests back to green again.José Valim2010-01-263-17/+3
|
* Fix failing tests on AM about render(:body => Hash).José Valim2010-01-266-68/+36
|
* Merge branch 'master' of git://github.com/rails/railsJosé Valim2010-01-266-2/+58
|\
| * Failing AM test for legacy multipart alternative renderingJoshua Peek2010-01-263-0/+39
| |
| * Failing AM test for nested layoutsJoshua Peek2010-01-263-2/+19
| |
* | Also include translation in ActionMailer.José Valim2010-01-261-0/+1
|/
* Tidy up tests and docs.José Valim and Mikel Lindsaar2010-01-262-20/+21
|
* Fixing up tests and docs to use defaults :from => 'name' instead of ↵Mikel Lindsaar2010-01-272-4/+5
| | | | defaults({:from => 'name'})
* Merge branch 'master' of github.com:mikel/railsMikel Lindsaar2010-01-274-26/+43
|\ | | | | | | | | Conflicts: actionmailer/lib/action_mailer/base.rb
| * Deprecate old defaults API.José Valim and Mikel Lindsaar2010-01-264-32/+43
| |
* | Fixed up documentation to reflect code change and cleaned up tests of ↵Mikel Lindsaar2010-01-272-59/+58
| | | | | | | | spurious #deliver calls
* | Fixed up being able to pass random headers in with headers, or mail. Also, ↵Mikel Lindsaar2010-01-272-16/+50
|/ | | | undeprecated headers(hash) as this works now too
* Make defaults accept a hash.José Valim and Mikel Lindsaar2010-01-262-79/+84
|
* Fixing up expectations in base_test.rbMikel Lindsaar2010-01-261-10/+10
|
* Implementing class level :defaults hash, instead of delivers_from et alMikel Lindsaar2010-01-262-16/+49
|
* Merge remote branch 'mikel/master'José Valim2010-01-2652-1086/+1736
|\
| * Fix small typo.José Valim and Mikel Lindsaar2010-01-261-1/+1
| |
| * Merge branch 'master' of github.com:mikel/railsJosé Valim and Mikel Lindsaar2010-01-262-18/+36
| |\
| | * Refactor content type setting, added tests to ensure boundary exists on ↵José Valim and Mikel Lindsaar2010-01-262-18/+36
| | | | | | | | | | | | multipart and fixed typo
| * | Remove old files, add some information to docs and improve test suite.José Valim and Mikel Lindsaar2010-01-264-38/+58
| |/
| * We don't support enriched yetJosé Valim and Mikel Lindsaar2010-01-261-1/+0
| |
| * Added initial documentation for the new APIJosé Valim and Mikel Lindsaar2010-01-253-119/+202
| |
| * Updated to mail 2.1.1José Valim and Mikel Lindsaar2010-01-251-1/+1
| |
| * Updated gemspec for MailJosé Valim and Mikel Lindsaar2010-01-251-1/+1
| |
| * Got AM working with Mail yield on delivery_handler and updated testsJosé Valim and Mikel Lindsaar2010-01-257-13/+23
| |
| * changed test to get TestMailer to use :file delivery method directly (as ↵José Valim and Mikel Lindsaar2010-01-251-3/+3
| | | | | | | | setup action was resetting delivery_method to :test on init
| * Added delivery_handler method to mail and implemented in ActionMailer to ↵José Valim and Mikel Lindsaar2010-01-254-9/+43
| | | | | | | | deliver inside of instrumentation
| * Added delivers_from.José Valim and Mikel Lindsaar2010-01-252-5/+18
| |
| * Add some view paths tests.José Valim and Mikel Lindsaar2010-01-252-23/+43
| |
| * Merge branch 'master' of github.com:mikel/railsJosé Valim and Mikel Lindsaar2010-01-241-7/+1
| |\
| | * Merge branch 'master' of git://github.com/rails/railsJosé Valim and Mikel Lindsaar2010-01-251-7/+1
| | |\ | | | | | | | | | | | | | | | | | | | | Conflicts: actionmailer/lib/action_mailer/mail_helper.rb railties/lib/rails/configuration.rb
| * | | Ensure implicit multipart templates with locale works as expected.José Valim and Mikel Lindsaar2010-01-246-0/+36
| |/ /
| * | Add tests to mail helper.José Valim and Mikel Lindsaar2010-01-2411-141/+86
| | |
| * | Move old tests to a specific folder and add some delivery method tests.José Valim and Mikel Lindsaar2010-01-2416-73/+131
| | |
| * | Handle some TODOs and deprecations.José Valim and Mikel Lindsaar2010-01-246-40/+45
| | |
| * | Finish cleaning up delivery methods implementation.José Valim and Mikel Lindsaar2010-01-244-82/+66
| | |
| * | Maintain old_api and deprecated_api in different files.José Valim and Mikel Lindsaar2010-01-244-243/+261
| | |
| * | Add new class delivery method API.José Valim and Mikel Lindsaar2010-01-2412-271/+259
| | |
| * | Some refactoring.José Valim and Mikel Lindsaar2010-01-244-164/+164
| | |
| * | Adding failing tests for calling just the action, instead of ↵José Valim and Mikel Lindsaar2010-01-242-2/+18
| | | | | | | | | | | | :create_action_name and :deliver_action_name
| * | Moving AS::Notifications call to one location in baseJosé Valim and Mikel Lindsaar2010-01-242-14/+9
| | |
| * | Delegated ActionMailer::Base.deliveries to Mail.deliveries, added callback ↵José Valim and Mikel Lindsaar2010-01-2411-49/+70
| | | | | | | | | | | | support in Mail to call ActionMailer on delivery, moved deliver to deprecated API in preparation for new API
| * | Set sort order for explicit parts from the collector's template sequenceJosé Valim and Mikel Lindsaar2010-01-242-14/+17
| | |
| * | Add some tests to collector with templates and any.José Valim and Mikel Lindsaar2010-01-235-14/+50
| | |
| * | Make implicit and explicit templates pass through the same part creation ↵José Valim and Mikel Lindsaar2010-01-233-84/+104
| | | | | | | | | | | | process.
| * | Adding collector to ActionMailerJosé Valim and Mikel Lindsaar2010-01-231-0/+32
| | |
| * | Added basic explicit multipart rendering and testsJosé Valim and Mikel Lindsaar2010-01-234-19/+79
| | |
| * | Refactor subject with i18n.José Valim and Mikel Lindsaar2010-01-231-3/+7
| | |
| * | Updated Gemspec to mail 2.0.3 from gemcutterMikel Lindsaar2010-01-231-1/+1
| | |
| * | Get implicit multipart and attachments working together.José Valim and Mikel Lindsaar2010-01-224-40/+109
| | |