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

	Commit message (Expand)	Author	Age	Files	Lines
*	Ensure that running tests in parallel doesn't display schema load output	bogdanvlviv	2018-08-08	1	-0/+18
*	Merge pull request #33548 from Ana06/lambda-validation	Rafael França	2018-08-07	1	-0/+7
\|\
\| *	Add lambdas in conditional validations	Ana María Martínez Gómez	2018-08-07	1	-0/+7
\|/
*	Merge pull request #33541 from lsylvester/clean-template-method-names	Eileen M. Uchitelle	2018-08-07	2	-1/+8
\|\
\| *	update BacktraceCleaner::RENDER_TEMPLATE_PATTERN to match the ActionView::Tem...	Lachlan Sylvester	2018-08-07	2	-1/+8
\|/
*	Camelize instead of classifying	George Claghorn	2018-08-06	1	-1/+1
*	Merge pull request #33540 from joeltaylor/improve_service_adapter_error_handling	George Claghorn	2018-08-06	2	-1/+9
\|\
\| *	Improve ActiveStorage service adapter error handling	Joel Taylor	2018-08-06	2	-1/+9
\|/
*	Merge pull request #33533 from lsylvester/fix-irb-backtrace-cleaner-test	Matthew Draper	2018-08-06	1	-5/+6
\|\
\| *	Filter backtrace in test to ensure irb counts as user code	Lachlan Sylvester	2018-08-06	1	-5/+6
\|/
*	Merge pull request #33531 from bogdanvlviv/move-changelog-entry-of-47018a82-up	Ryuta Kamizono	2018-08-06	1	-11/+11
\|\
\| *	Move changelog entry of 47018a82 up [ci skip]	bogdanvlviv	2018-08-05	1	-11/+11
\|/
*	Support skip nil for cache fetch (#25437)	Martin	2018-08-05	3	-1/+23
*	Merge pull request #33454 from azbshiri/extend-affects-nested-attributes	Richard Schneeman	2018-08-04	3	-2/+20
\|\
\| *	Call build when extend with nested attributes defined	Alireza Bashiri	2018-08-02	3	-2/+20
* \|	Merge pull request #33511 from albertoalmagro/change-references-from-rake-to-...	Richard Schneeman	2018-08-04	4	-6/+7
\|\ \
\| * \|	[ci skip] Change references from Rake task to Rails command	Alberto Almagro	2018-08-01	4	-6/+7
* \| \|	Fix uploading Tempfiles to Azure Storage	George Claghorn	2018-08-03	2	-1/+18
* \| \|	Merge pull request #33507 from jackc/patch-1	George Claghorn	2018-08-03	1	-1/+1
\|\ \ \
\| * \| \|	Fix file upload location recommendation	Jack Christensen	2018-08-01	1	-1/+1
\| \|/ /
* \| \|	Merge pull request #33452 from thetizzo/rails_32_to_40_doc_update	George Claghorn	2018-08-03	1	-0/+11
\|\ \ \
\| * \| \|	Update Rails 3.2 to 4.0 upgrade guide to include a mention and tip for handli...	thetizzo	2018-08-03	1	-0/+11
* \| \| \|	Merge pull request #33524 from spikeheap/master	Prem Sichanugrist	2018-08-03	1	-1/+1
\|\ \ \ \
\| * \| \| \|	[ci skip] Update adding member routes guide to fix inconsistency with the imp...	Ryan Brooks	2018-08-03	1	-1/+1
\|/ / / /
* \| \| \|	`retrieve_connection_pool` return a pool, not a connection	Ryuta Kamizono	2018-08-03	1	-2/+2
* \| \| \|	Remove another unused require	George Claghorn	2018-08-02	1	-2/+0
\| \|_\|/ \|/\| \|
* \| \|	Merge pull request #33513 from twitnithegirl/only_connect_once_in_parallel_tests	Ryuta Kamizono	2018-08-02	1	-1/+0
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	don't establish connection test_database since it gets established in load_sc...	Britni Alexander	2018-08-01	1	-1/+0
\|/ /
* \|	Remove unused require	George Claghorn	2018-08-01	1	-2/+0
* \|	Merge pull request #33479 from twitnithegirl/make_parallel_testing_db_faster	Eileen M. Uchitelle	2018-08-01	2	-6/+9
\|\ \
\| * \|	use load_schema instead of migrate for parallel testing	Britni Alexander	2018-07-31	2	-6/+9
\|/ /
* \|	Retry ActiveStorage::PurgeJobs on DB deadlock	George Claghorn	2018-07-31	1	-0/+1
* \|	Merge pull request #33492 from kamipo/revert_breaking_default_order_contract	Ryuta Kamizono	2018-08-01	3	-22/+14
\|\ \
\| * \|	Revert "Merge pull request #24131 from brchristian/limit_and_primary_key"	Ryuta Kamizono	2018-08-01	3	-22/+1
\| * \|	Add test case for the #5153's default order contract	Ryuta Kamizono	2018-08-01	1	-0/+13
* \| \|	Merge pull request #28937 from maclover7/jm-fix-28927	Rafael França	2018-07-31	2	-1/+15
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Default content type for `head` is `text/html`	Jon Moss	2017-04-30	2	-1/+15
* \| \|	Merge pull request #33490 from rails/revert-31883-remove-label-in-porgress-fo...	Xavier Noria	2018-07-31	1	-0/+2
\|\ \ \
\| * \| \|	Revert "Remove label 'work in progress' for AM and AV guides"	Xavier Noria	2018-07-31	1	-0/+2
\|/ / /
* \| \|	Merge pull request #31883 from bogdanvlviv/remove-label-in-porgress-for-M-V-g...	Richard Schneeman	2018-07-31	1	-2/+0
\|\ \ \
\| * \| \|	Remove label 'work in progress' for AM and AV guides	bogdanvlviv	2018-02-04	1	-2/+0
* \| \| \|	Merge pull request #33488 from znz/avoid-to-post-twice	Rafael França	2018-07-31	1	-1/+2
\|\ \ \ \
\| * \| \| \|	Throw if ujs loaded twice	Kazuhiro NISHIYAMA	2018-07-31	1	-1/+2
* \| \| \| \|	Merge pull request #33489 from Atul9/remote-ip	George Claghorn	2018-07-31	2	-1/+7
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Log the remote IP addr of clients behind a proxy	Atul Bhosale	2018-07-31	2	-1/+7
\|/ / / /
* \| \| \|	:scissors: .	Ryuta Kamizono	2018-07-31	1	-1/+1
* \| \| \|	Merge pull request #33446 from ptoomey3/nested-respond-to	Richard Schneeman	2018-07-31	4	-0/+70
\|\ \ \ \
\| * \| \| \|	Raises exception when respond_to called multiple times in incompatible way	Patrick Toomey	2018-07-30	4	-0/+70
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge pull request #33486 from f-mer/patch-1	Ryuta Kamizono	2018-07-31	1	-1/+1
\|\ \ \ \
\| * \| \| \|	Fix example in thread_mattr_accessor documentation	Fabian Mersch	2018-07-31	1	-1/+1
\|/ / / /