aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
Commit message (Expand)AuthorAgeFilesLines
* 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
* Include AbsC::Rendering interface in ActionMailerŁukasz Strzałkowski2013-08-251-0/+3
* Do not include AV::RenderingŁukasz Strzałkowski2013-08-251-1/+0
* Integrate ActionMailer with ActionViewŁukasz Strzałkowski2013-08-252-2/+6
* Merge branch 'master' of github.com:rails/docrailsVijay Dev2013-08-172-4/+1
|\
| * Revert "Merge branch 'master' of github.com:rails/docrails"Vijay Dev2013-08-172-4/+1
* | Merge pull request #11722 from arunagw/removed-deprecation-silenced-from-testRafael Mendonça França2013-08-021-2/+0
|\ \
| * | As we are doing debug mode onArun Agrawal2013-08-021-2/+0
* | | map => map! for stopping extra array creationRajarshi Das2013-08-021-1/+1
|/ /
* / grab executable from rubygemsArun Agrawal2013-07-261-2/+1
|/
* Don't mutate the Base settings by merge!ing the given valueAkira Matsuda2013-07-262-1/+4
* don't convert mailer default values to procsAlex Tsukernik2013-07-224-3/+12
* Merge pull request #11046 from arunagw/verbose_mode_onCarlos Antonio da Silva2013-06-251-1/+1
|\
| * Adding verbose in isolated test.Arun Agrawal2013-06-211-1/+1
* | Saying gemcutter => rubygems [ci skip]Arun Agrawal2013-06-211-1/+1
|/
* No need to load 'rake/packagetask' as it's alreadyArun Agrawal2013-06-021-1/+0
* No need CHANGELOG entry for a test fixRafael Mendonça França2013-05-201-4/+1
* Merge pull request #10646 from kennyj/fix_am_20130517Rafael Mendonça França2013-05-202-2/+5
|\
| * Fix AM testcase break with mail 2.5.4. It seems that AM's testcase was wrong.kennyj2013-05-172-2/+5
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-05-194-4/+22
|\ \ | |/ |/|
| * Revert "ActionMailer::Collector should be nodoc'd"Vijay Dev2013-05-191-1/+1
| * Revert "nodoc ActionMailer module from lib/action_mailer/*.rb"Vijay Dev2013-05-199-9/+9
| * Revert "Document Rails::Generators::MailerGenerator"Vijay Dev2013-05-191-4/+2
| * Fix documentation for ActionMailer template names.Megan Bowra-Dean2013-05-171-4/+4
| * Document Rails::Generators::MailerGeneratorZachary Scott2013-05-151-2/+4
| * nodoc ActionMailer module from lib/action_mailer/*.rbZachary Scott2013-05-159-9/+9
| * Document ActionMailer::MailHelperZachary Scott2013-05-151-0/+3
| * Document ActionMailer::LogSubscriber and ActionMailer::DeliveryMethods::Class...Zachary Scott2013-05-152-0/+6
| * ActionMailer::Collector should be nodoc'dZachary Scott2013-05-151-1/+1
| * Document ActionMailer::Base#set_content_typeZachary Scott2013-05-121-0/+9
* | Update mail to minimum version 2.5.4Mikel Lindsaar2013-05-141-1/+1
* | Extract variable out of loopVipul A M2013-05-131-1/+2
|/
* RDoc style for ActionMailer::Base#mailZachary Scott2013-05-101-23/+25
* Document ActionMailer::Base::default, ::mailer_name, and #mailer_nameZachary Scott2013-05-101-14/+25