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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #25517 from alexcameron89/per_thread_registry	Jon Moss	2016-06-24	1	-1/+1
\|\
\| *	[ci skip] Add link to method referenced in ActiveSupport::PerThreadRegistry	Alex Kitchens	2016-06-24	1	-1/+1
\|/
*	Merge pull request #25514 from maclover7/jm-ar-nodoc	Kasper Timm Hansen	2016-06-24	1	-1/+1
\|\
\| *	nodoc `ActiveRecord::AttributeSet::YAMLEncoder`	Jon Moss	2016-06-24	1	-1/+1
\|/
*	Revert "[ci skip] better docs for ActiveRecord::AttributeSet::YAMLEncoder#dec...	Jon Moss	2016-06-24	1	-17/+0
*	Merge pull request #25506 from y-yagi/return_correct_from_enum_type	Sean Griffin	2016-06-24	2	-0/+6
\|\
\| *	return correct type from `EnumType`	yuuji.yaginuma	2016-06-24	2	-0/+6
* \|	Merge pull request #25470 from alexcameron89/master	Vipul A M	2016-06-24	1	-1/+12
\|\ \
\| * \|	[ci skip] Add additional documentation to ActiveModel::Errors	Alex Kitchens	2016-06-22	1	-1/+12
* \| \|	Merge pull request #25502 from Edouard-chin/exclusive-scope-test-residue	Rafael França	2016-06-24	1	-6/+0
\|\ \ \
\| * \| \|	Removed a forgotten `with_exclusive_scope` test:	Edouard CHIN	2016-06-24	1	-6/+0
\|/ / /
* \| \|	Merge pull request #25478 from maclover7/jm-permitted-false	Rafael França	2016-06-23	2	-0/+8
\|\ \ \
\| * \| \|	`params.permitted?` is false by default	Jon Moss	2016-06-23	2	-0/+8
* \| \| \|	Merge pull request #25486 from alexcameron89/inheritance	Jon Moss	2016-06-23	1	-1/+2
\|\ \ \ \
\| * \| \| \|	[ci skip] Update Documentation on ActiveRecord::Inheritance	Alex Kitchens	2016-06-23	1	-1/+2
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge pull request #25485 from georgemillo/patch-1	Jon Moss	2016-06-23	1	-1/+1
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|
\| * \| \|	English fix	George Millo	2016-06-23	1	-1/+1
\|/ / /
* \| \|	Merge pull request #25480 from kmcphillips/master	Rafael França	2016-06-22	2	-0/+11
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Update changelog for #25351	Kevin McPhillips	2016-06-22	1	-0/+5
\| * \|	Update changelog for #25341	Kevin McPhillips	2016-06-22	1	-0/+6
\|/ /
* \|	Initialize the configuration with a value	Rafael Mendonça França	2016-06-22	4	-10/+2
* \|	Merge pull request #25473 from bquorning/update-documentation-for-strong_para...	Jon Moss	2016-06-22	1	-19/+18
\|\ \
\| * \|	Update ActionController::Parameters documentation [ci skip]	Benjamin Quorning	2016-06-22	1	-19/+18
\|/ /
* \|	Fix failing railties tests	eileencodes	2016-06-22	3	-0/+9
* \|	Add option to enable dependency loading in production	Rafael Mendonça França	2016-06-22	2	-1/+3
* \|	Merge pull request #25469 from herminiotorres/update-datetime-to-datetime-loc...	Rafael Mendonça França	2016-06-22	6	-139/+39
\|\ \ \| \|/ \|/\|
\| *	Change datetime to datetime-local helper tag	Herminio Torres	2016-06-21	6	-139/+39
* \|	Merge pull request #25467 from aarongray/tweak_time_helpers_docs_for_time_zones	Vipul A M	2016-06-22	1	-3/+3
\|\ \ \| \|/ \|/\|
\| *	Create times in rails timezone not system timezone [ci skip]	aarongray	2016-06-21	1	-3/+3
\|/
*	Merge pull request #25464 from prathamesh-sonpatki/fix-http-request	Rafael França	2016-06-21	1	-1/+1
\|\
\| *	update_url is not `get` most of the times [ci skip]	Prathamesh Sonpatki	2016-06-22	1	-1/+1
\|/
*	Revert "Merge pull request #17973 from maurogeorge/file_field_hidden_field"	eileencodes	2016-06-21	3	-53/+5
*	Change the raw template handler to render html-safe strings	eileencodes	2016-06-21	3	-1/+19
*	Merge pull request #25458 from taboularasa/taboularasa/update-docs-ActiveReco...	Jon Moss	2016-06-21	1	-0/+17
\|\
\| *	[ci skip] better docs for ActiveRecord::AttributeSet::YAMLEncoder#decode	David Elliott	2016-06-21	1	-0/+17
* \|	Merge pull request #25415 from maclover7/jm-fix-25410	Rafael França	2016-06-21	1	-0/+6
\|\ \ \| \|/ \|/\|
\| *	Add test to better demonstrate `ActiveModel::Errors#added?` behavior	Jon Moss	2016-06-21	1	-0/+6
* \|	Merge pull request #25450 from prathamesh-sonpatki/fix-testing-guide	Kasper Timm Hansen	2016-06-21	1	-7/+11
\|\ \
\| * \|	Fix the docs for supported keyword args for Rails 5 style integration control...	Prathamesh Sonpatki	2016-06-21	1	-7/+11
* \| \|	Merge pull request #25452 from taboularasa/taboularasa/update-docs-api_docume...	Kasper Timm Hansen	2016-06-20	1	-1/+1
\|\ \ \
\| * \| \|	[ci skip] correction in command for generating api documentation	David Elliott	2016-06-20	1	-1/+1
\|/ / /
* \| \|	Merge pull request #25430 from nfm/fix-rails-info-routes-for-apps-with-globbi...	Richard Schneeman	2016-06-20	3	-1/+27
\|\ \ \
\| * \| \|	Fix rails/info routes for apps with globbing route	Nicholas Firth-McCoy	2016-06-20	3	-1/+27
\| \|/ /
* \| \|	Merge pull request #25449 from alexcameron89/master	प्रथमेश Sonpatki	2016-06-20	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	[ci skip] fix typo in ActiveRecord::ConnectionHandling	Alex Kitchens	2016-06-20	1	-1/+1
\|/ /
* \|	Merge pull request #25433 from prathamesh-sonpatki/cleanup-app-generator-code	Guillermo Iguaran	2016-06-20	1	-2/+0
\|\ \
\| * \|	No need to have conditional based on api options in assets	Prathamesh Sonpatki	2016-06-20	1	-2/+0
* \| \|	Merge pull request #25420 from michaeldever/mdever_actioncable_development_ports	Guillermo Iguaran	2016-06-20	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Allow actioncable connections from any port in development	Michael Dever	2016-06-16	1	-1/+1
* \| \|	Merge pull request #25436 from prathamesh-sonpatki/fix-tests	Richard Schneeman	2016-06-19	2	-3/+3
\|\ \ \