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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Revert "Merge pull request #20758 from ↵	Kasper Timm Hansen	2015-07-07	1	-4/+2
\| \| \| \| \| \| \|	xijo/action_mailer_message_delivery_respects_i18n_locale" This reverts commit f2a8c23654d69dd8f294971487b5abf0e5d891c3, reversing changes made to 3046c9bbe154aa717a5147091be8b495ed8969c4.
*	ActionMailer::MessageDelivery respects current I18n.locale	Johannes Opper	2015-07-05	1	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When #deliver_now is called all translations within the generated email will be looked up for the current I18n locale. I18n.locale = ‘de’ mail.deliver_now # Generates german email, correct In #enqueue_delivery the locale was not considered and the resulting job uses the default locale. I18n.locale = ‘de’ mail.deliver_later # Generate english email, incorrect In order to achieve a consistent behaviour the current locale is now always passed to `ActionMailer::DeliveryJob`.
*	Allow configuration of ActionMailer queue name	Chris McGrath	2015-06-02	1	-1/+1
\|
*	Merge pull request #18163 from y-yagi/fix_nodoc_typo	Yves Senn	2014-12-23	1	-2/+2
\|\ \| \| \| \| \| \|	fix typo in nodoc [ci skip]
\| *	fix typo in nodoc	yuuji.yaginuma	2014-12-23	1	-1/+1
\|/
*	Making the actionmailer docs more explicit to understand [ci skip]	Rishi Jain	2014-10-26	1	-0/+2
\|
*	Updated rdoc / guides / release notes related to ActiveJob / ActionMailer	Cristian Bica	2014-08-20	1	-2/+2
\|
*	[ActionMailer] Rename ActionMailer::DelayedDeliveryJob to ↵	Abdelkader Boudih	2014-08-17	1	-0/+11
	ActionMailer::DeliveryJob