aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
Commit message (Expand)AuthorAgeFilesLines
* update version to 4.2.0.alphaYves Senn2014-02-231-1/+1
* Fix render plain docs example in AM::BaseGuillermo Iguaran2014-02-181-2/+2
* Update Docs in favor to use render plain instead of text optionrobertomiranda2014-02-181-3/+3
* Merge branch '4-1-0-beta2'Rafael Mendonça França2014-02-181-1/+1
|\
| * Preparing for 4.1.0.beta2 releaseRafael Mendonça França2014-02-181-1/+1
* | Fix typo [ci skip]Rafael Mendonça França2014-02-161-1/+1
* | Merge pull request #13997 from dmitry/test_coverage_improvementRafael Mendonça França2014-02-092-10/+21
|\ \
| * | add actionmailer test coverage for undefined delivery methodDmitry Polushkin2014-02-092-10/+21
* | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-02-091-1/+1
|\ \ \ | |/ / |/| |
| * | e-mail => email, and subject/verb agreementWaynn Lue2014-01-131-1/+1
* | | tidy CHANGELOGs [ci skip]Yves Senn2014-01-301-4/+6
* | | Remove an extra comment [ci skip]Robin Dupret2014-01-261-1/+0
* | | Support underscored symbols in Action Mailer configAndrew White2014-01-263-5/+37
* | | Don't use a class_attribute for ActionMailer::Base.preview_pathAndrew White2014-01-262-7/+3
* | | Add the ability to intercept emails before previewingAndrew White2014-01-264-5/+109
* | | docs should say `email` not `Email`. [ci skip]Yves Senn2014-01-201-1/+1
* | | removed extra comma [ci skip]Kuldeep Aggarwal2014-01-141-1/+1
* | | standardize on jruby_skip & rbx_skipGaurish Sharma2014-01-131-0/+9
* | | quick formatting pass through CHANGELOGS. [ci skip].Yves Senn2014-01-061-0/+2
* | | Add preview_path to autoload_paths in after_initializeAndrew White2014-01-042-6/+14
* | | update copyright notices to 2014. [ci skip]Vipul A M2014-01-012-2/+2
|/ /
* | Improve font of some code in API documentation [ci skip]Chun-wei Kuo2013-12-261-17/+18
* | document how to access mail previews. [ci skip]Yves Senn2013-12-181-0/+3
|/
* Get ready to release 4.1.0.beta1David Heinemeier Hansson2013-12-171-1/+1
* Disable available locales checks to avoid warnings running the testsCarlos Antonio da Silva2013-12-171-0/+3
* Add mailer previews feature based on mail_view gemAndrew White2013-12-175-0/+101
* Include AV::Layouts directly in AM::BaseŁukasz Strzałkowski2013-12-051-0/+2
* Retain ActionPack dependency on ActionViewŁukasz Strzałkowski2013-12-051-3/+0
* `mail()` without arguments is a getter for the current mail.Yves Senn2013-12-023-0/+42
* Merge remote-tracking branch 'docrails/master'Xavier Noria2013-11-241-1/+1
|\
| * Update README.rdoc [ci skip]Harshad Sabne2013-11-081-1/+1
* | Improve changelogsCarlos Antonio da Silva2013-11-221-7/+9
* | Ruby's new Hash syntax applied in actionmailerMr A2013-11-144-5/+5
|/
* calculate the ivars to remove in advance as a set and cache them in aAaron Patterson2013-11-061-1/+5
* Merge pull request #12591 from vipulnsward/remove_mail_mergeYves Senn2013-10-201-3/+3
|\
| * Remove extra variable creation and merge.Vipul A M2013-10-201-3/+3
* | Instrument the generation of Action Mailer messagesDaniel Schierbeck2013-10-204-7/+29
|/
* take out reference to previous versions of RailsWaynn Lue2013-09-121-3/+1
* Remove unused raw email fixturesclaudiob2013-09-1215-736/+0
* Merge pull request #12184 from waynn/patch-4Steve Klabnik2013-09-101-1/+1
|\
| * [ci skip] 'previous version of Rails' is gramatically incorrectWaynn Lue2013-09-101-1/+1
* | Don't mutate the Base settings by merge!ing the given valueAkira Matsuda2013-09-102-1/+4
|/
* Revert "Port all remaining self.protected_instance_variables to class methods"Łukasz Strzałkowski2013-09-021-4/+2
* Port all remaining self.protected_instance_variables to class methodsŁukasz Strzałkowski2013-08-291-2/+4
* Make AV dependency for ActionMailerŁukasz Strzałkowski2013-08-261-1/+1
* Remove hard require to ActionView from ActionMailerŁukasz Strzałkowski2013-08-253-2/+1
* Require log_subscriberŁukasz Strzałkowski2013-08-251-0/+2
* Remove dependency on AVŁukasz Strzałkowski2013-08-251-1/+1
* Load AV::Layout to AM::Base in railtiesŁukasz Strzałkowski2013-08-253-2/+7
* Do not silance mail gem warnings.Łukasz Strzałkowski2013-08-251-5/+1