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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #26177 from achinn/ac-live-deadlock	Matthew Draper	2016-08-16	3	-1/+30
\|\
\| *	Fix deadlock that can occur when child live thread tries to load a constant a...	Alex Chinn	2016-08-15	3	-1/+30
* \|	Merge pull request #26178 from claudiob/load-table-metadata	Rafael França	2016-08-15	1	-1/+1
\|\ \ \| \|/ \|/\|
\| *	Eager autoload ActiveRecord::TableMetadata	claudiob	2016-08-15	1	-1/+1
\|/
*	Merge pull request #26176 from stomar/clarify-update-task	Vipul A M	2016-08-16	1	-1/+1
\|\
\| *	Clarify use of update task on 4.2 and earlier [ci skip]	Marcus Stollsteimer	2016-08-15	1	-1/+1
* \|	Merge pull request #26167 from kamipo/remove_find_nth_with_limit_and_offset	Kasper Timm Hansen	2016-08-15	1	-34/+13
\|\ \
\| * \|	Remove `find_nth_with_limit_and_offset` private method	Ryuta Kamizono	2016-08-15	1	-34/+13
* \| \|	Merge pull request #26170 from eugeneius/rm_log_subscriber_odd_ivar	Kasper Timm Hansen	2016-08-15	1	-5/+0
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	Remove odd ivar from ActiveRecord::LogSubscriber	Eugene Kenny	2016-08-15	1	-5/+0
* \| \|	Merge pull request #26160 from prathamesh-sonpatki/use-encoding-from-metal	Matthew Draper	2016-08-16	1	-1/+1
\|\ \ \
\| * \| \|	AC::Metal is already defining default encoding as UTF 8, let's reuse it.	Prathamesh Sonpatki	2016-08-14	1	-1/+1
* \| \| \|	Merge pull request #25570 from y-yagi/remove_useless_parameter	Eileen M. Uchitelle	2016-08-15	1	-3/+3
\|\ \ \ \
\| * \| \| \|	remove useless parameter	yuuji.yaginuma	2016-06-29	1	-4/+4
* \| \| \| \|	Merge pull request #26168 from chuckdishmon/fix-plural-usage	Jon Moss	2016-08-14	1	-1/+1
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \|
\| * \| \| \|	fix usage of pluralized word	chuckdishmon	2016-08-14	1	-1/+1
\|/ / / /
* \| \| \|	Merge pull request #26166 from kamipo/fix_ar_fixtures_doc	Jon Moss	2016-08-14	1	-4/+4
\|\ \ \ \
\| * \| \| \|	Fix `ActiveRecord::FixtureSet` docs [ci skip]	Ryuta Kamizono	2016-08-15	1	-4/+4
\|/ / / /
* \| \| \|	Revert "Clarify and fix typos in Autoloading Disabled upgrade guide [ci skip]"	Xavier Noria	2016-08-15	1	-12/+12
* \| \| \|	Merge pull request #26150 from kamipo/consolidate_ar_test_case_and_as_test_case	Sean Griffin	2016-08-14	3	-21/+20
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|
\| * \| \|	Consolidate `ActiveRecord::TestCase` and `ActiveSupport::TestCase` in AR test...	Ryuta Kamizono	2016-08-14	3	-21/+20
\| \| \|/ \| \|/\|
* \| \|	Pass along original attribute to save later recursion	Aaron Patterson	2016-08-14	2	-1/+8
* \| \|	Merge pull request #26012 from grosser/grosser/missing	Sean Griffin	2016-08-14	1	-1/+1
\|\ \ \
\| * \| \|	add index to array methods so we can call it on relations	Michael Grosser	2016-08-12	1	-1/+1
* \| \| \|	Merge pull request #26163 from olivierlacan/clarify-autoloading-disabled	Jon Moss	2016-08-14	1	-12/+12
\|\ \ \ \
\| * \| \| \|	Clarify and fix typos in Autoloading Disabled upgrade guide [ci skip]	Olivier Lacan	2016-08-14	1	-12/+12
\| \| \|/ / \| \|/\| \|
* \| \| \|	[ci skip] Link to the request helpers documentation.	Kasper Timm Hansen	2016-08-14	1	-0/+3
* \| \| \|	[ci skip] Update integration test request encoding documentation.	Kasper Timm Hansen	2016-08-14	1	-13/+14
* \| \| \|	Merge pull request #26159 from prathamesh-sonpatki/fix-cache-logging-doc	Kasper Timm Hansen	2016-08-14	1	-8/+16
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Fix the documentation for configuring `enable_fragment_cache_logging` [ci skip]	Prathamesh Sonpatki	2016-08-14	1	-8/+16
\|/ / /
* \| \|	Merge pull request #26146 from bcardarella/bc-clean-up-action-mailer-dirs	Rafael França	2016-08-13	2	-0/+2
\|\ \ \
\| * \| \|	Ensure app/mailers is removed when skipping action-mailer	Brian Cardarella	2016-08-12	2	-0/+2
\|/ / /
* \| \|	Merge pull request #25856 from mrageh/improve-lazy-load-hook-docs	Rafael França	2016-08-12	1	-0/+2
\|\ \ \
\| * \| \|	Add documentation about `ActiveSupport.on_load`	mrageh	2016-08-13	1	-0/+2
\|/ / /
* \| \|	Merge pull request #26113 from kamipo/use_ar_test_case_instead_of_as_test_case	Rafael França	2016-08-12	2	-2/+2
\|\ \ \
\| * \| \|	Use `ActiveRecord::TestCase` rather than `ActiveSupport::TestCase` in AR test...	Ryuta Kamizono	2016-08-11	2	-2/+2
* \| \| \|	Merge pull request #26143 from nathanl/self-explanatory-cache-durations	Rafael França	2016-08-12	2	-2/+2
\|\ \ \ \
\| * \| \| \|	Make cache max-age durations self-explanatory	Nathan Long	2016-08-12	2	-2/+2
* \| \| \| \|	Merge pull request #26100 from vipulnsward/changelogs	Rafael França	2016-08-12	6	-13/+16
\|\ \ \ \ \
\| * \| \| \| \|	Pass over changelogs [ci skip]	Vipul A M	2016-08-10	6	-13/+16
* \| \| \| \| \|	Make private method private	Rafael Mendonça França	2016-08-12	1	-11/+11
* \| \| \| \| \|	Mark method as nodoc	Rafael Mendonça França	2016-08-12	1	-3/+3
* \| \| \| \| \|	Merge pull request #26144 from javierjulio/patch-1	Jon Moss	2016-08-12	1	-1/+1
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Given a hash (Rails 5) .from_hash must be used	Javier Julio	2016-08-12	1	-1/+1
\|/ / / / /
* \| \| \| \|	Merge pull request #26133 from smellsblue/dont-fail-on-non-string	Rafael França	2016-08-12	2	-1/+9
\|\ \ \ \ \
\| * \| \| \| \|	Ensure values are strings before calling gsub	Mike Virata-Stone	2016-08-12	2	-1/+9
\|/ / / / /
* \| \| \| \|	Merge pull request #26125 from qinix/fix-doc	Jon Moss	2016-08-11	1	-3/+3
\|\ \ \ \ \
\| * \| \| \| \|	[ci skip] Fix documentation wrong for ActionCable	Eric Zhang	2016-08-12	1	-1/+1
\| * \| \| \| \|	[ci skip] Fix documentation for ActionCable::Channel#broadcast_to	Eric Zhang	2016-08-12	1	-2/+2
* \| \| \| \| \|	Merge pull request #26118 from alexcameron89/param-encoding-documentation	Jon Moss	2016-08-11	1	-0/+1
\|\ \ \ \ \ \