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

	Commit message (Expand)	Author	Age	Files	Lines
*	use our runner (`bin/test`) for framework components.	Yves Senn	2015-06-11	6	-0/+27
*	inline test runner check into `as/testing/autorun.rb`.	Yves Senn	2015-06-11	2	-5/+9
*	Revert "Add code example for include option of AM::Serialization#serializable...	Rafael Mendonça França	2015-06-10	1	-14/+1
*	Merge pull request #20500 from repinel/use-block-not-global-var	Rafael Mendonça França	2015-06-09	2	-3/+3
\|\
\| *	Use block variable instead of global	Roque Pinel	2015-06-09	2	-3/+3
\|/
*	Add code example for include option of AM::Serialization#serializable_hash	Radan Skoric	2015-06-09	1	-1/+14
*	Merge pull request #20496 from prathamesh-sonpatki/rm-note	Arun Agrawal	2015-06-09	1	-4/+0
\|\
\| *	Remove NOTE related to format.js [ci skip]	Prathamesh Sonpatki	2015-06-09	1	-4/+0
\|/
*	Merge pull request #20493 from dansteele/patch-1	Zachary Scott	2015-06-09	1	-24/+0
\|\
\| *	Removed AJAX example with poor convention adherence	Daniel Steele	2015-06-09	1	-24/+0
\|/
*	Merge pull request #20437 from pwnall/abstract_fixtures	Rafael Mendonça França	2015-06-09	5	-1/+31
\|\
\| *	Fix crash when loading fixture with belongs_to association defined in abstrac...	Victor Costan	2015-06-04	5	-1/+31
* \|	Merge pull request #20491 from Gaurav2728/gaurav-command_line_guide	Arun Agrawal	2015-06-09	1	-2/+2
\|\ \
\| * \|	update Rails Command Line guide page	Gaurav Sharma	2015-06-09	1	-2/+2
\|/ /
* \|	Tiny documentation edits [ci skip]	Robin Dupret	2015-06-09	2	-8/+8
* \|	Merge pull request #20483 from davydovanton/fix-typo-am-test	Rafael Mendonça França	2015-06-08	1	-1/+1
\|\ \
\| * \|	Fix typo in AM I18n validation test name [skip ci]	Anton Davydov	2015-06-09	1	-1/+1
* \| \|	Merge pull request #20486 from repinel/improve-gsub-and-global-vars	Rafael Mendonça França	2015-06-08	1	-1/+1
\|\ \ \
\| * \| \|	Use block variable instead of global	Roque Pinel	2015-06-08	1	-1/+1
\|/ / /
* \| \|	remove unused code	Aaron Patterson	2015-06-08	1	-2/+2
* \| \|	we only care about methods that the request object responds to	Aaron Patterson	2015-06-08	1	-2/+1
* \| \|	extract required_defaults from the conditions hash before constructing the route	Aaron Patterson	2015-06-08	6	-56/+56
\|/ /
* \|	Merge pull request #20479 from masarakki/no-scaffold.css-option	Rafael Mendonça França	2015-06-08	3	-1/+18
\|\ \
\| * \|	add option to avoid generating scaffold.css	masarakki	2015-06-09	3	-1/+18
\|/ /
* \|	Merge pull request #20124 from greysteil/fix-select-helper	Rafael Mendonça França	2015-06-08	3	-3/+21
\|\ \
\| * \|	Raise an ArgumentError when `include_blank` is false for a required field in	Grey Baker	2015-06-08	3	-3/+21
\|/ /
* \|	Merge pull request #20463 from yui-knk/fix/guide1	Zachary Scott	2015-06-08	2	-2/+2
\|\ \
\| * \|	[ci skip] Fix hours to minutes in `select_minute`	yui-knk	2015-06-07	2	-2/+2
* \| \|	Merge pull request #20470 from vngrs/add_missing_docs_for_action_dispatch_ses...	Zachary Scott	2015-06-08	1	-0/+33
\|\ \ \
\| * \| \|	Add missing documentation for ActionDispatch::Request::Session [ci skip]	Mehmet Emin İNAÇ	2015-06-07	1	-0/+33
* \| \| \|	Merge pull request #20381 from kuldeepaggarwal/engines-docs	Yves Senn	2015-06-08	1	-5/+5
\|\ \ \ \
\| * \| \| \|	[ci skip]fix docs for Engines	Kuldeep Aggarwal	2015-05-30	1	-5/+5
* \| \| \| \|	Merge pull request #19571 from kaspth/improve-runner-integration	Yves Senn	2015-06-08	12	-293/+298
\|\ \ \ \ \
\| * \| \| \| \|	Improve test runner's Minitest integration.	Kasper Timm Hansen	2015-06-04	12	-293/+298
* \| \| \| \| \|	Merge pull request #20476 from hanachin/fix-core_text	Kasper Timm Hansen	2015-06-08	1	-1/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Fix core_text -> core_ext	Seiei Miyagi	2015-06-08	1	-1/+1
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #20474 from asanghi/patch-1	Arun Agrawal	2015-06-08	1	-1/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Code fix in CHANGELOG	Aditya Sanghi	2015-06-08	1	-1/+1
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #20460 from mtsmfm/stop-to-s-for-fixture-timestamps	Sean Griffin	2015-06-07	1	-1/+0
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Stop `to_s(:db)` for fixture's timestamp	Fumiaki MATSUSHIMA	2015-06-07	1	-1/+0
* \| \| \| \| \| \|	Merge pull request #20471 from y-yagi/add_instantiation_to_instrumentation_guide	Zachary Scott	2015-06-07	1	-0/+14
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	add `instantiation.active_record` hook to instrumentation guide [ci skip]	yuuji.yaginuma	2015-06-08	1	-0/+14
\| \| \|_\|_\|/ / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #20472 from Coaxial/patch-1	Zachary Scott	2015-06-07	1	-0/+2
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Add missing NOTE for Time extensions' location	Pierre	2015-06-07	1	-0/+2
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #20448 from sgrif/sg-postgresql-point-type	Sean Griffin	2015-06-07	6	-11/+189
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Return a `Point` object from the PG Point type	Sean Griffin	2015-06-05	6	-11/+189
* \| \| \| \| \| \|	Merge pull request #20464 from ronakjangir47/active_support_stubbing	Arthur Nogueira Neves	2015-06-07	10	-309/+366
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Removed mocha stubbing in active_support	Ronak Jangir	2015-06-07	10	-309/+366
\| \| \|/ / / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Tiny documentation edits [ci skip]	Robin Dupret	2015-06-07	3	-4/+7
* \| \| \| \| \| \|	Merge pull request #20004 from rusikf/patch-1	Robin Dupret	2015-06-07	1	-0/+31
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \|