1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Commit graph

24 commits

Author SHA1 Message Date
Akira Matsuda
0c93a48904 Don't mutate the Base settings by merge!ing the given value 2013-09-10 18:10:48 +02:00
Vijay Dev
ec8ef1e105 Revert "Merge branch 'master' of github.com:rails/docrails"
This reverts commit 70d6e16fba, reversing
changes made to ea4db3bc07.

Seems to be a code merge done by mistake.
2013-08-17 21:46:39 +05:30
Akira Matsuda
64202abc3d Don't mutate the Base settings by merge!ing the given value 2013-07-26 04:04:51 +09:00
Vijay Dev
99819d3c8e Revert "nodoc ActionMailer module from lib/action_mailer/*.rb"
This reverts commit 328e876a15.

Reason: Let's not nodoc without reason.

[ci skip]
2013-05-19 21:06:06 +05:30
Zachary Scott
328e876a15 nodoc ActionMailer module from lib/action_mailer/*.rb 2013-05-15 00:38:51 -04:00
Zachary Scott
41c3670fab Document ActionMailer::LogSubscriber and ActionMailer::DeliveryMethods::ClassMethods 2013-05-15 00:19:38 -04:00
Kirill Nikitin
96f290eac0 Update actionmailer with new hash syntax. 2012-10-07 21:54:14 +04:00
Francesco Rodriguez
e2c7545cdd update ActionMailer documentation [ci skip] 2012-09-17 19:18:56 -05:00
Aditya Sanghi
8fc8763fde Allow delivery method options to be set per mail instance 2012-09-04 22:34:41 +05:30
José Valim
485e655082 Revert "Merge pull request #7202 from asanghi/perform_deliveries_in_mail"
Reverting because it feels backward to specify a delivery to not
be performed while the e-mail is being composed. It is simpler (and
makes more sense) to delegate the responsibility to the calling code.
2012-08-07 14:00:54 -03:00
Aditya Sanghi
7c8424e057 allow perform deliveries to be set within mailer action 2012-07-30 23:57:20 +05:30
Marcelo Silveira
5f2f9b57c4 No need to force conversion to Symbol since case ensures it's already
one.
2012-05-03 09:11:31 -03:00
Matt Jankowski
100b675cba singularize module and be explicit about what is delivered 2011-06-21 10:20:01 -04:00
Santiago Pastorino
b451de0d6d Deletes trailing whitespaces (over text files only find * -type f -exec sed 's/[ \t]*$//' -i {} \;) 2010-08-14 04:12:33 -03:00
Jeremy Kemper
e5ab4b0d07 Convert to class_attribute 2010-02-01 02:02:42 -08:00
Mikel Lindsaar
bb2c7b432c Updating Action Mailer documentation 2010-01-31 09:46:51 -08:00
José Valim and Mikel Lindsaar
39a1b06f13 Deprecate old defaults API. 2010-01-26 11:46:42 +01:00
José Valim and Mikel Lindsaar
ace74974cf Got AM working with Mail yield on delivery_handler and updated tests 2010-01-25 21:47:03 +11:00
José Valim and Mikel Lindsaar
e4a989e9d9 Added delivery_handler method to mail and implemented in ActionMailer to deliver inside of instrumentation 2010-01-25 13:39:48 +11:00
José Valim and Mikel Lindsaar
bd96614101 Move old tests to a specific folder and add some delivery method tests. 2010-01-24 19:36:42 +01:00
José Valim and Mikel Lindsaar
0d931fecbb Finish cleaning up delivery methods implementation. 2010-01-24 18:11:57 +01:00
José Valim and Mikel Lindsaar
7409b73484 Some refactoring. 2010-01-24 16:37:28 +01:00
José Valim and Mikel Lindsaar
951397b4a2 Get implicit multipart and attachments working together. 2010-01-22 14:38:41 +01:00
José Valim
e10f51b6b7 Refactor delivery methods. 2010-01-19 15:34:58 +01:00