aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'mainstream/master'Pratik Naik2010-01-0444-9667/+1689
|\
| * Silence warningsMikel Lindsaar2010-01-021-1466/+1467
| * Expose a _render_partial hook as thhe _render_template one and make use of it.José Valim2009-12-311-0/+1
| * controller_path is required by ActionView, so move it up to AbstractControlle...José Valim2009-12-311-0/+1
| * Merge commit 'mikel/master'Jeremy Kemper2009-12-314-4/+13
| |\
| | * removing spurious lineMikel Lindsaar2009-12-311-1/+0
| | * Adding :transfer_encoding -> :content_transfer_encoding as part of TmailCompatMikel Lindsaar2009-12-314-4/+14
| * | Some railties cleanup:Carl Lerche2009-12-311-1/+1
| * | Rename rails.rb -> rails/all.rb and rails/core.rb -> rails.rbCarl Lerche2009-12-311-0/+1
| |/
| * Adding TMailCompat layer for :set_content_type and friendsMikel Lindsaar2009-12-302-0/+12
| * Adding default 8bit encoding if the body has non usascii in itMikel Lindsaar2009-12-281-0/+2
| * Remove unused code paths and require mail only when it's needed.José Valim2009-12-283-17/+9
| * Moved sort_parts into Mail, updated mail requirement to 1.4.2Mikel Lindsaar2009-12-282-32/+12
| * DRY ActionMailer code.José Valim2009-12-271-60/+61
| * Merge Mail with latest Rails and move mail gem to Gemfile.José Valim2009-12-278-98/+92
| |\
| | * Refactor multiple parts logic and move Utils to PartContainer.José Valim2009-12-254-31/+24
| | * adv_attr_accessors in ActionMailer are not sent to the views, use the mailer ...José Valim2009-12-254-31/+33
| | * Finish moving config.frameworks-dependent code to the framework pluginCarlhuda2009-12-231-0/+24
| | * All AM modules are safe to deferJoshua Peek2009-12-224-35/+17
| | * Flip deferrable autoload conventionJoshua Peek2009-12-221-13/+18
| | * Make ActionMailer::Base inherit from AbstractController::BaseJosé Valim2009-12-221-44/+16
| | * Fix ActionMailer. The fact that ActionMailer::Base does not inherit from Abst...Carlhuda2009-12-211-0/+3
| | * Rename the RenderingController module to just plain RenderingDavid Heinemeier Hansson2009-12-201-1/+1
| * | Updating action_mailer to need mail 1.4.1Mikel Lindsaar2009-12-271-1/+1
| * | Changing body to use :to_s instead of :decoded... better use caseMikel Lindsaar2009-12-271-1/+1
| * | Updating actionmailer to call :to_s on all field values instead of decodedMikel Lindsaar2009-12-271-1/+1
| * | Updating requirement for mail to 1.3.4Mikel Lindsaar2009-12-171-1/+1
| * | Updating requirement for mail to 1.3.3Mikel Lindsaar2009-12-171-1/+1
| * | Merged in latest changes from rails/masterMikel Lindsaar2009-12-173-2/+23
| * | Fixes for working with 1.9.1-headMikel Lindsaar2009-12-173-21/+1
| * | Merge branch 'rails'Mikel Lindsaar2009-12-174-37/+44
| |\|
| | * Fully expand relative rails framework paths and make sure we aren'tJoshua Peek2009-12-161-2/+3
| | * Should fix a few Sam Ruby fails.Yehuda Katz2009-12-031-1/+0
| | * Reorganize autoloads:Carlhuda2009-12-024-32/+36
| | * Silence known internal AM deprecation callsJoshua Peek2009-12-011-3/+7
| | * avoid generating invalid SMTP commands in ruby pre 1.9Michael Koziarski2009-11-281-1/+1
| * | Merge branch 'master' of git://github.com/rails/rails into rails_masterMikel Lindsaar2009-11-241-2/+4
| |\|
| * | Change require mail version to 1.3.0Mikel Lindsaar2009-11-241-1/+1
| * | Changed deprecation to use ActiveSupport::DeprecationMikel Lindsaar2009-11-241-2/+3
| * | Deprecating attachment :body => 'string' in favour of attachment :data => 'st...Mikel Lindsaar2009-11-231-1/+5
| * | Removing utils, and updating requires to matchMikel Lindsaar2009-11-233-13/+5
| * | Opps.. need to require it as well as gem mail :)Mikel Lindsaar2009-11-221-0/+1
| * | Adding mail as a gem loadMikel Lindsaar2009-11-221-2/+1
| * | 131 tests, 309 assertions, 0 failures, 0 errorsMikel Lindsaar2009-11-224-27/+7
| * | Down to 13 failures, 14 errorsMikel Lindsaar2009-11-201-1/+1
| * | Down to 30 failures totalMikel Lindsaar2009-11-201-5/+5
| * | More updates... 45 errors left to get it working with Mail gemMikel Lindsaar2009-11-203-24/+32
| * | Starting again on actionmailer integration with mailMikel Lindsaar2009-11-1235-8039/+74
* | | Merge remote branch 'mainstream/master'Pratik Naik2009-11-1710-344/+277
|\ \ \ | | |/ | |/|
| * | Be sure to invoke the super chain! And initialize response body.Jeremy Kemper2009-11-101-0/+2