aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
Commit message (Collapse)AuthorAgeFilesLines
* `mail()` without arguments is a getter for the current mail.Yves Senn2013-12-023-0/+42
| | | | | | | | | | | | | | This behavior is documented in our guides (http://edgeguides.rubyonrails.org/action_mailer_basics.html#action-mailer-callbacks) but was broken in the past. This commit short curcuits the `mail` method if: 1. mail() was previously called 2. no headers are passed 3. no block is passed Closes #13090. /cc @pixeltrix
* Merge remote-tracking branch 'docrails/master'Xavier Noria2013-11-241-1/+1
|\ | | | | | | | | | | Conflicts: activesupport/lib/active_support/core_ext/hash/deep_merge.rb activesupport/lib/active_support/core_ext/hash/keys.rb
| * Update README.rdoc [ci skip]Harshad Sabne2013-11-081-1/+1
| | | | | | Highlighted code
* | Improve changelogsCarlos Antonio da Silva2013-11-221-7/+9
| | | | | | | | | | Also make Action Mailer changelog format more consistent with the others [ci skip]
* | 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
| | | | | | | constant. `view_assigns` can use the precalculated sets and remove instance variables without allocating any extra arrays
* Merge pull request #12591 from vipulnsward/remove_mail_mergeYves Senn2013-10-201-3/+3
|\ | | | | Remove extra variable creation and merge.
| * 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
|/ | | | | | The processing of outbound mail is instrumented with the key `process.action_mailer`. The payload includes the mailer name as well as the mailer method.
* take out reference to previous versions of RailsWaynn Lue2013-09-121-3/+1
|
* Remove unused raw email fixturesclaudiob2013-09-1215-736/+0
| | | | The tests that used the raw_email_* fixtures were removed in d500ad3
* Merge pull request #12184 from waynn/patch-4Steve Klabnik2013-09-101-1/+1
|\ | | | | "previous version of Rails" is gramatically incorrect
| * [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
| | | | This reverts commit 7de994fa215e9f4c2856d85034bc4dd7b65d0c01.
* 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
| | | | I doesn't have any at the moment
* 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
| | | | It's already included in Layouts, makes no sense to doubly include it
* Integrate ActionMailer with ActionViewŁukasz Strzałkowski2013-08-252-2/+6
|
* Merge branch 'master' of github.com:rails/docrailsVijay Dev2013-08-172-4/+1
|\ | | | | | | | | | | | | | | Conflicts: actionview/README.rdoc activerecord/lib/active_record/migration.rb guides/source/development_dependencies_install.md guides/source/getting_started.md
| * Revert "Merge branch 'master' of github.com:rails/docrails"Vijay Dev2013-08-172-4/+1
| | | | | | | | | | | | | | This reverts commit 70d6e16fbad75b89dd1798ed697e7732b8606fa3, reversing changes made to ea4db3bc078fb3093ecdddffdf4f2f4ff3e1e8f9. Seems to be a code merge done by mistake.
* | 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 on
| * | As we are doing debug mode onArun Agrawal2013-08-021-2/+0
| | | | | | | | | | | | we don't need to silenced it
* | | map => map! for stopping extra array creationRajarshi Das2013-08-021-1/+1
|/ /
* / grab executable from rubygemsArun Agrawal2013-07-261-2/+1
|/ | | As done here d7fc97d3f90c0e30865d32ce202658f03248cacc
* 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
| | | | | | Invoke mailer defaults as procs only if they are procs, do not convert with to_proc. That an object is convertible to a proc does not mean it's meant to be always used as a proc. Fixes #11533
* Merge pull request #11046 from arunagw/verbose_mode_onCarlos Antonio da Silva2013-06-251-1/+1
|\ | | | | Verbose mode on when running tests
| * 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
| | | | | in 'rubygems/package_task'
* No need CHANGELOG entry for a test fixRafael Mendonça França2013-05-201-4/+1
| | | | [ci skip]
* Merge pull request #10646 from kennyj/fix_am_20130517Rafael Mendonça França2013-05-202-2/+5
|\ | | | | Fix ActionMailer testcase break with mail 2.5.4.
| * 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
| | | | | | | | | | | | | | | | This reverts commit e47c85c696de1c4137c222bedc846b2cdbb0893f. Reason: Let's not nodoc without reason. [ci skip]
| * Revert "nodoc ActionMailer module from lib/action_mailer/*.rb"Vijay Dev2013-05-199-9/+9
| | | | | | | | | | | | | | | | This reverts commit 328e876a1569058e47eaf7ea3f4f045a83b585fa. Reason: Let's not nodoc without reason. [ci skip]
| * Revert "Document Rails::Generators::MailerGenerator"Vijay Dev2013-05-191-4/+2
| | | | | | | | | | | | | | | | This reverts commit dfb69f2b8a85586ad70071baba416747cbb07364. Reason: Let's not nodoc without reason. [ci skip]
| * Fix documentation for ActionMailer template names.Megan Bowra-Dean2013-05-171-4/+4
| | | | | | | | ActionMailer templates that are not plain text do not require *.text.* in the name and will fail to be picked up automatically if it is included in the name.
| * 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 ↵Zachary Scott2013-05-152-0/+6
| | | | | | | | ActionMailer::DeliveryMethods::ClassMethods
| * ActionMailer::Collector should be nodoc'dZachary Scott2013-05-151-1/+1
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 23:26:29 +0000