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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #15083 from zuhao/refactor_actionmailer_i18n_with_controll...	Yves Senn	2014-05-13	1	-11/+14
\|\
\| *	Use with_translation helper to clean up I18n stored translations.	Zuhao Wan	2014-05-13	1	-11/+14
* \|	Merge pull request #15082 from zuhao/refactor_actionmailer_delivery_methods_test	Yves Senn	2014-05-13	1	-30/+42
\|\ \
\| * \|	Move state restoration from setup/teardown into affected test cases.	Zuhao Wan	2014-05-13	1	-30/+42
* \| \|	Merge pull request #15086 from zuhao/refactor_actionmailer_mail_layout_test	Yves Senn	2014-05-13	1	-10/+0
\|\ \ \
\| * \| \|	Remove unnecessary setup and teardown.	Zuhao Wan	2014-05-13	1	-10/+0
\| \| \|/ \| \|/\|
* \| \|	docs, explain usage of `count` + `select`. Closes #15065. [ci skip]	Yves Senn	2014-05-13	1	-0/+8
* \| \|	Merge pull request #15085 from zuhao/refactor_actionmailer_log_subscriber_test	Yves Senn	2014-05-13	1	-3/+5
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	A minor stylistic fix and cleanup of mail deliveries.	Zuhao Wan	2014-05-13	1	-3/+5
\|/ /
* \|	fix bad merge	Aaron Patterson	2014-05-12	1	-15/+0
* \|	avoid array allocation when extracting usernames and passwords	Aaron Patterson	2014-05-12	1	-1/+7
* \|	Ok. Enough models for today :rage:	Rafael Mendonça França	2014-05-12	1	-3/+6
* \|	Test with ruby-head to make @tenderlove happy	Rafael Mendonça França	2014-05-12	1	-0/+2
* \|	This is also a model	Rafael Mendonça França	2014-05-12	1	-1/+1
* \|	This model is a model so it should behaves like one	Rafael Mendonça França	2014-05-12	1	-7/+3
* \|	Merge pull request #15080 from eileencodes/flip-unless-else-conditional-in-ha...	Rafael Mendonça França	2014-05-12	1	-3/+3
\|\ \
\| * \|	flip conditional to use if/else instead of unless/else	eileencodes	2014-05-12	1	-3/+3
\|/ /
* \|	Revert "reduce conditionals in url_for"	Aaron Patterson	2014-05-12	1	-6/+3
* \|	:cry::gun: use an empty hash for magical speed.	Aaron Patterson	2014-05-12	1	-1/+5
* \|	this class is a model, so it should act like one	Aaron Patterson	2014-05-12	1	-0/+3
* \|	use the helper method builder to construct helper methods	Aaron Patterson	2014-05-12	3	-59/+118
* \|	probably should not check in a raise	Aaron Patterson	2014-05-12	1	-1/+0
* \|	undo optimized calls until the builder object is finished	Aaron Patterson	2014-05-12	3	-41/+23
* \|	remove suffix from the handler methods	Aaron Patterson	2014-05-12	1	-20/+19
* \|	push list handling to the builder object	Aaron Patterson	2014-05-12	1	-30/+30
* \|	push string handling to the builder object	Aaron Patterson	2014-05-12	1	-10/+8
* \|	push model and class handling to a helper builder object	Aaron Patterson	2014-05-12	1	-36/+48
* \|	adding a method to handle strings using the same api	Aaron Patterson	2014-05-12	1	-22/+32
* \|	fix url_for with classes	Aaron Patterson	2014-05-12	1	-1/+1
* \|	break each polymorphic type to it's own method	Aaron Patterson	2014-05-12	2	-25/+86
* \|	remove dead code	Aaron Patterson	2014-05-12	1	-12/+0
* \|	only test `persisted?` on the record once	Aaron Patterson	2014-05-12	1	-3/+7
* \|	only send options if there are any options	Aaron Patterson	2014-05-12	1	-5/+7
* \|	add a test for the parameters sent to the url helper for new records	Aaron Patterson	2014-05-12	1	-0/+15
* \|	remove should_pop variable	Aaron Patterson	2014-05-12	1	-4/+1
* \|	only pop records when we get an array	Aaron Patterson	2014-05-12	1	-6/+7
* \|	remove unnecessary array allocations	Coraline Ada Ehmke + Aaron Patterson	2014-05-12	1	-5/+1
* \|	simplified route method name generation	Coraline Ada Ehmke + Aaron Patterson	2014-05-12	2	-27/+19
* \|	small refactoring	Coraline Ada Ehmke + Aaron Patterson	2014-05-12	1	-6/+2
* \|	pulling helpermethods up before refactoring	Coraline Ada Ehmke + Aaron Patterson	2014-05-12	1	-20/+46
* \|	push all is_a tests up, always pass options to the named route	Aaron Patterson	2014-05-12	1	-28/+27
* \|	pull nil checks up	Aaron Patterson	2014-05-12	1	-3/+5
* \|	skip another Array is_a check	Aaron Patterson	2014-05-12	1	-4/+6
* \|	only do the Array is_a check once	Aaron Patterson	2014-05-12	1	-4/+3
* \|	we always convert this variable to a list, so we can remove the unconversion	Aaron Patterson	2014-05-12	1	-1/+0
* \|	record as a hash is not possible, so rm branch	Aaron Patterson	2014-05-12	1	-2/+0
* \|	stop popping in build_named_route_call	Aaron Patterson	2014-05-12	1	-4/+3
* \|	remove extract_record since we have extracted the list	Aaron Patterson	2014-05-12	1	-12/+1
* \|	always pass a list to build_named_route_call	Aaron Patterson	2014-05-12	1	-10/+19
* \|	add a test with three objects	Aaron Patterson	2014-05-12	1	-2/+13