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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #25366 from prathamesh-sonpatki/update-release-notes-2	Rafael França	2016-06-11	1	-1/+19
\|\
\| *	Add missing things to Rails 5.0 release notes [ci skip]	Prathamesh Sonpatki	2016-06-11	1	-1/+19
* \|	Merge pull request #25367 from stephenminded/active_job_test_helper_custom_qu...	Rafael França	2016-06-11	2	-1/+26
\|\ \
\| * \|	Provide the ability to override the queue adapter used by jobs under	Steve Lounsbury	2016-06-11	2	-1/+26
* \| \|	Merge pull request #25368 from frodsan/patch-1	Rafael França	2016-06-11	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Fix typo	Francesco Rodriguez	2016-06-12	1	-1/+1
\|/ /
* \|	Merge pull request #25363 from kamipo/fix_or_result_sql	Vipul A M	2016-06-11	1	-1/+1
\|\ \ \| \|/ \|/\|
\| *	Fix `or` result SQL [ci skip]	Ryuta Kamizono	2016-06-11	1	-1/+1
\|/
*	Merge pull request #25361 from maclover7/jm-rm-stuff	Sean Griffin	2016-06-10	1	-11/+0
\|\
\| *	Remove `_run_class_setup`	Jon Moss	2016-06-10	1	-11/+0
* \|	Merge pull request #25321 from prathamesh-sonpatki/update-release-notes-1	Rafael França	2016-06-10	1	-10/+33
\|\ \ \| \|/ \|/\|
\| *	Add missing things to release notes [ci skip]	Prathamesh Sonpatki	2016-06-07	1	-10/+33
* \|	Make sure the yielded variable is the logger	Rafael Mendonça França	2016-06-10	2	-4/+6
* \|	Merge pull request #25351 from kmcphillips/asset-default-config-quiet	Rafael França	2016-06-10	1	-0/+3
\|\ \
\| * \|	Add config.assets.quiet = true as default value	Kevin McPhillips	2016-06-10	1	-0/+3
* \| \|	Merge pull request #25341 from kmcphillips/master	Rafael França	2016-06-10	3	-34/+124
\|\ \ \
\| * \| \|	Be explicit about what Logger class is expected	Kevin McPhillips	2016-06-09	1	-3/+3
\| * \| \|	Broadcast #silence on logger. Rewrite tests.	Kevin McPhillips	2016-06-09	2	-31/+121
* \| \| \|	Merge pull request #25352 from Shopify/optimized-delegate	Rafael França	2016-06-10	1	-2/+2
\|\ \ \ \
\| * \| \| \|	Replace Kernel#caller by the faster Kernel#caller_locations	Jean Boussier	2016-06-10	1	-2/+2
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge pull request #25342 from Edouard-chin/callbacks-wrong-method-name	Vipul A M	2016-06-10	1	-1/+6
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	[ci skip] `define_model_callbacks` only exist in active model:	Edouard CHIN	2016-06-10	1	-1/+6
\| \|/ /
* \| \|	Merge pull request #25348 from alexcameron89/master	Jon Moss	2016-06-10	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Fix typo in ActionController::Renderer [ci skip]	Alex Kitchens	2016-06-10	1	-1/+1
\|/ /
* \|	Merge pull request #25338 from jwworth/fix_typo_sucker_punch_1465507047	Jon Moss	2016-06-09	1	-1/+1
\|\ \
\| * \|	Fix typo, `of of` -> `of` [ci skip]	Jake Worth	2016-06-09	1	-1/+1
\|/ /
* \|	Remove dead code from tests	Sean Griffin	2016-06-09	1	-17/+0
* \|	render_to_string Regression Outside of Real Requests in Rails 5.0.0.rc1 (#25308)	Brandon Medenwald	2016-06-09	2	-1/+8
* \|	Merge pull request #25329 from yahonda/allow_oracle_bind_value_syntax_in_loj_...	Sean Griffin	2016-06-09	1	-1/+1
\|\ \
\| * \|	Allow Oracle bind parameter syntax `:a1`	Yasuo Honda	2016-06-08	1	-1/+1
* \| \|	Merge pull request #25334 from abhishekjain16/doc_fix	Sean Griffin	2016-06-09	1	-2/+2
\|\ \ \
\| * \| \|	Fix typo	Abhishek Jain	2016-06-09	1	-2/+2
* \| \| \|	Merge pull request #25335 from y-yagi/remove_deprecated_prefix_option	Vipul A M	2016-06-08	1	-2/+0
\|\ \ \ \
\| * \| \| \|	remove deprecated `:prefix` option from doc [ci skip]	yuuji.yaginuma	2016-06-09	1	-2/+0
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge pull request #25332 from abhishekjain16/test_fix	Rafael França	2016-06-09	2	-3/+3
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|
\| * \| \|	existant => existent	Abhishek Jain	2016-06-09	2	-3/+3
\|/ / /
* \| \|	Merge pull request #25315 from schneems/schneems/inclusion-doc	Richard Schneeman	2016-06-08	1	-3/+9
\|\ \ \
\| * \| \|	[ci skip] Expand information on message options	schneems	2016-06-08	1	-3/+9
* \| \| \|	Merge pull request #25327 from prathamesh-sonpatki/add-5-0-notes-to-the-index	Xavier Noria	2016-06-08	1	-0/+5
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|
\| * \| \|	Add Rails 5.0 release notes to the index page of guides [ci skip]	Prathamesh Sonpatki	2016-06-08	1	-0/+5
\| \| \|/ \| \|/\|
* \| \|	Merge pull request #25323 from vipulnsward/ac-release-notes	David Heinemeier Hansson	2016-06-08	1	-2/+13
\|\ \ \
\| * \| \|	Add Action Cable introduction to release notes [ci skip]	Vipul A M	2016-06-07	1	-2/+13
* \| \| \|	Merge pull request #25281 from maclover7/jm-add-internal	Sean Griffin	2016-06-07	3	-1/+37
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|
\| * \| \|	Prevent `{ internal: true }` from being stored in the router	Jon Moss	2016-06-07	3	-1/+37
\|/ / /
* \| \|	Merge pull request #25317 from prathamesh-sonpatki/fix-api-controller-tests	Kasper Timm Hansen	2016-06-07	2	-7/+7
\|\ \ \
\| * \| \|	Fix API controller tests by assigning them the encoding type	Prathamesh Sonpatki	2016-06-07	2	-7/+7
* \| \| \|	Merge pull request #25247 from y-yagi/reference_actual_class	Kasper Timm Hansen	2016-06-07	1	-1/+1
\|\ \ \ \
\| * \| \| \|	reference actual class to use middleware	yuuji.yaginuma	2016-06-02	1	-1/+1
* \| \| \| \|	Add regression test to `as` option.	Kasper Timm Hansen	2016-06-07	1	-0/+16
* \| \| \| \|	Merge pull request #25079 from jeffkreeftmeijer/send_file-halts-request-cycle	Sean Griffin	2016-06-07	4	-6/+23
\|\ \ \ \ \