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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #25769 from y-yagi/remove_unnecessary_send	Guillermo Iguaran	2016-07-10	1	-5/+5
\|\
\| *	remove unnecessary send	yuuji.yaginuma	2016-07-10	1	-5/+5
* \|	Merge branch 'master' of github.com:rails/docrails	Vijay Dev	2016-07-10	3	-3/+18
\|\ \ \| \|/ \|/\|
\| *	Fix documentation for number_with_precision helper in AV guide [ci skip]	Prathamesh Sonpatki	2016-07-06	1	-1/+1
\| *	Expand on Instance variables section with an example and specify when the ins...	Vipul A M	2016-07-02	1	-1/+14
\| *	Fix number_with_precision documentation for precision [ci skip]	Vipul A M	2016-07-02	1	-1/+1
\| *	Expand on #24071 for specifying custom locale fallbacks. [ci skip]	Vipul A M	2016-06-29	1	-1/+3
* \|	Merge pull request #25759 from prathamesh-sonpatki/changelog-cleanups	Rafael França	2016-07-09	2	-8/+12
\|\ \
\| * \|	Cleanup CHANGELOGs [ci skip]	Prathamesh Sonpatki	2016-07-09	2	-8/+12
* \| \|	Merge pull request #25766 from vipulnsward/fix-ac-tests-2-4	Rafael França	2016-07-09	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Fix AJ tests on ruby 2.4 being causes since classes are unified for Integer, ...	Vipul A M	2016-07-09	1	-1/+1
* \| \|	Merge pull request #23636 from rab/fix-to_param-truncation	Matthew Draper	2016-07-09	3	-4/+41
\|\ \ \
\| * \| \|	fix to_param to maximize content	Rob Biedenharn	2016-07-08	3	-4/+41
\|/ / /
* \| \|	Merge pull request #25652 from prathamesh-sonpatki/rm-boot-rails	Guillermo Iguaran	2016-07-08	38	-46/+3
\|\ \ \
\| * \| \|	Remove unused boot_rails method and it's usage	Prathamesh Sonpatki	2016-07-04	38	-46/+3
* \| \| \|	Merge pull request #25688 from mahnunchik/host-env-var	Guillermo Iguaran	2016-07-08	2	-0/+8
\|\ \ \ \
\| * \| \| \|	Use the HOST environment variable for rails server #25677	Evgeny Vlasenko	2016-07-05	2	-0/+8
* \| \| \| \|	Correct changelog layout	Matthew Draper	2016-07-09	1	-8/+8
* \| \| \| \|	Insert changelog entry for #25615	Matthew Draper	2016-07-09	1	-0/+7
* \| \| \| \|	Merge pull request #25624 from tinco/actioncable_write_race	Matthew Draper	2016-07-09	2	-2/+12
\|\ \ \ \ \
\| * \| \| \| \|	fix race condition in websocket stream write	Tinco Andringa	2016-07-01	1	-0/+4
* \| \| \| \| \|	Merge pull request #25714 from robin850/changelog-25692	Rafael Mendonça França	2016-07-07	1	-0/+6
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Add a changelog entry for #25692 [ci skip]	Robin Dupret	2016-07-06	1	-0/+6
* \| \| \| \| \| \|	Merge pull request #25745 from alexcameron89/schema_statements	Vipul A M	2016-07-07	1	-12/+12
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	[ci skip] Update documentation in AR SchemaStatements	Alex Kitchens	2016-07-07	1	-12/+12
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #25730 from prathamesh-sonpatki/rm-cookie-only	Rafael França	2016-07-07	2	-1/+7
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Add a test case for verifying `cookie_only` is set even if user tries to set ...	Prathamesh Sonpatki	2016-07-07	2	-1/+7
* \| \| \| \| \| \|	Merge pull request #25743 from abhishekjain16/small_fix	Rafael França	2016-07-07	1	-1/+1
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Fix typo in test case	Abhishek Jain	2016-07-08	1	-1/+1
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #25736 from voxik/file-store-test-require-pathname	Rafael França	2016-07-07	1	-0/+2
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Pathname might not be always initialized.	Vít Ondruch	2016-07-07	1	-0/+2
* \| \| \| \| \| \| \|	Merge pull request #25731 from chen7897499/fix_typo	Yves Senn	2016-07-07	1	-1/+1
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Fix typo: caches_pages to caches_page.	chen7897499	2016-07-07	1	-1/+1
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #25691 from y-yagi/test_with_latest_rescue	Rafael França	2016-07-07	2	-8/+13
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	test with latest resque	yuuji.yaginuma	2016-07-05	2	-8/+13
* \| \| \| \| \| \| \| \|	Merge pull request #25707 from matthewd/double-reap	Matthew Draper	2016-07-07	4	-11/+50
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Make connection stealing more explicit	Matthew Draper	2016-07-06	3	-6/+27
\| * \| \| \| \| \| \| \| \|	Reduce locking by taking ownership of stale connections	Matthew Draper	2016-07-06	1	-9/+8
\| * \| \| \| \| \| \| \| \|	Re-check that the connection is still stale before we reap it	Matthew Draper	2016-07-06	2	-0/+9
\| * \| \| \| \| \| \| \| \|	Check connection ownership before allowing a thread to release it	Matthew Draper	2016-07-06	1	-1/+11
* \| \| \| \| \| \| \| \| \|	Merge pull request #25726 from Gaurav2728/update_doc_for_require_relative	Matthew Draper	2016-07-07	2	-5/+5
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	update doc for prefer require_relative over require + File.expand_path [ci skip]	Gaurav Sharma	2016-07-07	2	-5/+5
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge pull request #25720 from timrogers/actiondispatch-ssl-defaults-docs	प्रथमेश Sonpatki	2016-07-06	1	-4/+5
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	[ci skip] Correct defaults in documentation for ActionDispatch::SSL	Tim Rogers	2016-07-06	1	-4/+5
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge pull request #25717 from alexcameron89/connection_pool_doc	प्रथमेश Sonpatki	2016-07-06	1	-21/+21
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	[ci skip] Update ConnectionPool documentation for readability	Alex Kitchens	2016-07-06	1	-21/+21
\| \| \|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #25716 from willnet/remove-rails-4	प्रथमेश Sonpatki	2016-07-06	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	[ci skip] Remove reference to Rails 4 in the initialization guide.	willnet	2016-07-06	1	-1/+1
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #25708 from maclover7/jm-master-bugreports	Santiago Pastorino	2016-07-06	3	-3/+3
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Bump version for master bug report templates	Jon Moss	2016-07-05	3	-3/+3