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

	Commit message (Expand)	Author	Age	Files	Lines
*	Set flash in test session when necessary.	Guo Xiang Tan	2014-06-12	1	-2/+5
*	Merge pull request #15678 from sgrif/sg-test-hash	Matthew Draper	2014-06-13	1	-0/+7
\|\
\| *	Add a test to ensure we don't get a performance regression on #hash	Sean Griffin	2014-06-12	1	-0/+7
* \|	Merge pull request #15677 from sgrif/sg-less-imperative-pk	Matthew Draper	2014-06-13	1	-3/+4
\|\ \
\| * \|	Use a conditional rather than early return in `id`	Sean Griffin	2014-06-12	1	-3/+4
\| \|/
* \|	Merge pull request #15676 from sgrif/sg-object-hash	Matthew Draper	2014-06-13	1	-1/+5
\|\ \ \| \|/ \|/\|
\| *	Defer to super, rather than re-implementing Object#hash	Sean Griffin	2014-06-12	1	-1/+5
\|/
*	Merge pull request #15665 from sgrif/sg-id-perf	Sean Griffin	2014-06-12	2	-1/+2
\|\
\| *	Fix performance regression on preloading HABTM associations	Sean Griffin	2014-06-12	2	-1/+2
* \|	Merge pull request #15654 from pdg137/master	Matthew Draper	2014-06-13	5	-7/+51
\|\ \
\| * \|	In tag helper, honor html_safe on array parameters; also make safe_join more ...	Paul Grayson	2014-06-12	4	-8/+51
* \| \|	Merge pull request #15667 from samdec/mailer_doc_bug_fix	Sean Griffin	2014-06-12	1	-1/+1
\|\ \ \
\| * \| \|	fix bug in email with name example code	Sam DeCesare	2014-06-11	1	-1/+1
* \| \| \|	Merge pull request #15666 from akshay-vishnoi/doc_changes	Sean Griffin	2014-06-12	1	-1/+1
\|\ \ \ \
\| * \| \| \|	[ci skip] Correct output of #assert_not	Akshay Vishnoi	2014-06-12	1	-1/+1
* \| \| \| \|	Merge pull request #15672 from sgrif/sg-topics-content	Matthew Draper	2014-06-13	2	-11/+11
\|\ \ \ \ \
\| * \| \| \| \|	Update test data which doesn't reflect expected usage	Sean Griffin	2014-06-12	2	-11/+11
\|/ / / / /
* \| \| \| \|	only check named_host? once in normalize_host	Aaron Patterson	2014-06-12	1	-3/+7
* \| \| \| \|	lookup subdomain from the options hash once, defaulting to true	Aaron Patterson	2014-06-12	1	-2/+2
* \| \| \| \|	only extract domain from the options hash once	Aaron Patterson	2014-06-12	1	-3/+4
* \| \| \| \|	reduce calls to `named_host?`	Aaron Patterson	2014-06-12	1	-2/+6
\|/ / / /
* \| \| /	use Ruby for mocking	Aaron Patterson	2014-06-12	1	-1/+1
\| \|_\|/ \|/\| \|
* \| \|	Merge pull request #15394 from morgoth/fix-automatic-maintaining-test-schema-...	Yves Senn	2014-06-12	4	-2/+104
\|\ \ \
\| * \| \|	Fixed automatic maintaining test schema to properly handle sql structure sche...	Wojciech Wnętrzak	2014-06-12	4	-3/+64
\| * \| \|	Added missing test case for migrations when using sql structure	Wojciech Wnętrzak	2014-06-01	1	-1/+40
* \| \| \|	Merge pull request #15590 from zuhao/refactor_actionview_register_template_ha...	Yves Senn	2014-06-12	6	-18/+62
\|\ \ \ \
\| * \| \| \|	Add unregister_template_handler to prevent leaks.	Zuhao Wan	2014-06-12	7	-18/+62
* \| \| \| \|	Merge pull request #15662 from JuanitoFatas/patch/remove-warning	Yves Senn	2014-06-12	1	-2/+2
\|\ \ \ \ \
\| * \| \| \| \|	Removed warning actionpack url.rb	Juanito Fatas	2014-06-12	1	-2/+2
\|/ / / / /
* \| \| \| \|	Merge pull request #15647 from sgrif/sg-unused-require	Yves Senn	2014-06-12	1	-2/+0
\|\ \ \ \ \
\| * \| \| \| \|	Remove unused require	Sean Griffin	2014-06-11	1	-2/+0
* \| \| \| \| \|	Merge pull request #15655 from fabianrbz/remove-unused-method-in-test	Yves Senn	2014-06-12	1	-10/+0
\|\ \ \ \ \ \
\| * \| \| \| \| \|	remove unnused method from test	Fabian Rodriguez	2014-06-11	1	-10/+0
\| \| \|_\|_\|/ / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge pull request #15657 from JohnRiv/guides_asset_pipeline_local	Zachary Scott	2014-06-11	1	-5/+4
\|\ \ \ \ \ \
\| * \| \| \| \| \|	There are 3 caveats to Local Precompilation including 1 config change	John Riviello	2014-06-11	1	-5/+4
* \| \| \| \| \| \|	Merge pull request #15656 from JohnRiv/guides_asset_pipeline_precompiling	Zachary Scott	2014-06-11	1	-1/+1
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Updating argument names in default matcher for compiling files	John Riviello	2014-06-11	1	-1/+1
\| \|/ / / / /
* \| \| \| \| \|	remove useless to_param call	Aaron Patterson	2014-06-11	1	-1/+1
* \| \| \| \| \|	only look up the subdomain once	Aaron Patterson	2014-06-11	1	-3/+4
* \| \| \| \| \|	scheme should contain one or more characters	Aaron Patterson	2014-06-11	1	-1/+1
* \| \| \| \| \|	pull the port out of the options hash once	Aaron Patterson	2014-06-11	1	-2/+3
* \| \| \| \| \|	remove useless nil check	Aaron Patterson	2014-06-11	1	-2/+2
* \| \| \| \| \|	these methods are always called with a tld_parameter	Aaron Patterson	2014-06-11	1	-3/+3
\|/ / / / /
* \| \| \| \|	Merge pull request #15652 from sgrif/pluck-multiple-named-columns	Rafael Mendonça França	2014-06-11	3	-3/+15
\|\ \ \ \ \
\| * \| \| \| \|	Pluck should work with columns of the same name from different tables	Sean Griffin	2014-06-11	3	-3/+15
\|/ / / / /
* \| \| \| \|	rm `same_host?`. The same conditional is two lines down.	Aaron Patterson	2014-06-11	1	-5/+3
* \| \| \| \|	Revert "rm `same_host?`. The same conditional is two lines down."	Aaron Patterson	2014-06-11	1	-5/+8
* \| \| \| \|	rm `same_host?`. The same conditional is two lines down.	Aaron Patterson	2014-06-11	1	-8/+5
* \| \| \| \|	Revert "remove unnecssary require of `to_param`, as `to_query` is already req...	Rafael Mendonça França	2014-06-11	4	-0/+4
* \| \| \| \|	Merge pull request #15650 from kuldeepaggarwal/remove-unecessary-require	Rafael Mendonça França	2014-06-11	3	-3/+0
\|\ \ \ \ \