rails.git - Mirror of official rails repo with custom fixes.

	Commit message (Collapse)	Author	Age	Files	Lines
*	Don't mutate the Base settings by merge!ing the given value	Akira Matsuda	2013-09-10	1	-0/+3
\|
*	Revert "Merge branch 'master' of github.com:rails/docrails"	Vijay Dev	2013-08-17	1	-3/+0
\| \| \| \| \| \| \|	This reverts commit 70d6e16fbad75b89dd1798ed697e7732b8606fa3, reversing changes made to ea4db3bc078fb3093ecdddffdf4f2f4ff3e1e8f9. Seems to be a code merge done by mistake.
*	Don't mutate the Base settings by merge!ing the given value	Akira Matsuda	2013-07-26	1	-0/+3
\|
*	Update actionmailer with new hash syntax.	Kirill Nikitin	2012-10-07	1	-26/+26
\|
*	Allow delivery method options to be set per mail instance	Aditya Sanghi	2012-09-04	1	-0/+39
\|
*	Revert "Merge pull request #7202 from asanghi/perform_deliveries_in_mail"	José Valim	2012-08-07	1	-13/+0
\| \| \| \| \| \|	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.
*	allow perform deliveries to be set within mailer action	Aditya Sanghi	2012-07-30	1	-0/+13
\|
*	Deletes trailing whitespaces (over text files only find * -type f -exec sed ↵	Santiago Pastorino	2010-08-14	1	-3/+3
\| \| \| \|	's/[ \t]*$//' -i {} \;)
*	Convert to class_attribute	Jeremy Kemper	2010-02-01	1	-2/+4
\|
*	Got AM working with Mail yield on delivery_handler and updated tests	José Valim and Mikel Lindsaar	2010-01-25	1	-2/+2
\|
*	Added delivery_handler method to mail and implemented in ActionMailer to ↵	José Valim and Mikel Lindsaar	2010-01-25	1	-5/+25
\| \| \| \|	deliver inside of instrumentation
*	Add tests to mail helper.	José Valim and Mikel Lindsaar	2010-01-24	1	-30/+30
\|
*	Move old tests to a specific folder and add some delivery method tests.	José Valim and Mikel Lindsaar	2010-01-24	1	-17/+95
\|
*	Finish cleaning up delivery methods implementation.	José Valim and Mikel Lindsaar	2010-01-24	1	-0/+72