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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge pull request #10646 from kennyj/fix_am_20130517	Rafael Mendonça França	2013-05-20	1	-1/+1
\| \| \| \| \| \| \|	Fix ActionMailer testcase break with mail 2.5.4. Conflicts: actionmailer/CHANGELOG.md actionmailer/test/mailers/base_mailer.rb
*	Backport #8450, the return value from mailer methods is not relevant.	Yves Senn	2012-12-10	1	-0/+5
\| \| \| \| \| \| \|	Conflicts: actionmailer/CHANGELOG.md actionmailer/lib/action_mailer/base.rb
*	Merge pull request #8048 from senny/7761_dont_render_view_without_mail_call	Rafael Mendonça França	2012-10-28	1	-0/+3
\| \| \| \| \| \|	Do not render views when mail() isn't called. (NullMail refactoring) Conflicts: actionmailer/CHANGELOG.md
*	Get rid of update_details in favor of passing details to find_template.	José Valim	2011-09-22	1	-1/+1
\|
*	Deprecate the old mailer API that was not deprecated yet.	José Valim	2010-08-29	1	-1/+1
\|
*	Ensure templates like template.html are found but still uses the proper ↵	José Valim	2010-08-26	1	-0/+4
\| \| \| \|	virtual path.
*	Deletes trailing whitespaces (over text files only find * -type f -exec sed ↵	Santiago Pastorino	2010-08-14	1	-3/+3
\| \| \| \|	's/[ \t]*$//' -i {} \;)
*	Move config_accessor :asset_host from ActionController::Base to ↵	Jeroen van Dijk and Josh Kalderimis	2010-07-24	3	-0/+137
	AbstractController which fixes issues with asset_host in ActionMailer Including: - Moved mailer objects in separate directory - Added two tests for asset_host configuration option