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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #31422 from Edouard-chin/multistatement-fixtures	Matthew Draper	2018-01-24	6	-56/+260
\|\
\| *	Allow a 2 bytes margin:	Edouard CHIN	2018-01-23	2	-4/+7
\| *	Combine delete and insert statements in the same query	Edouard CHIN	2018-01-22	2	-13/+10
\| *	Build a multi-statement query when inserting fixtures:	Edouard CHIN	2018-01-22	6	-56/+260
* \|	Fix CHANGELOG format [ci skip]	Ryuta Kamizono	2018-01-24	1	-4/+5
* \|	tweaks for #31704 [ci skip]	Ryuta Kamizono	2018-01-24	1	-2/+2
* \|	Clarification for noobs. (#31704)	loothunter1	2018-01-23	2	-4/+8
* \|	Merge pull request #30622 from aidanharan/custom-discarded-job-handling	Rafael França	2018-01-23	4	-1/+36
\|\ \
\| * \	Merge branch 'master' into custom-discarded-job-handling	Aidan Haran	2017-12-09	1020	-6684/+15161
\| \|\ \
\| * \| \|	Allow for custom handling of exceptions that are discarded	Aidan Haran	2017-09-16	4	-1/+36
* \| \| \|	Allow attributes with a proc default to be marshalled	Sean Griffin	2018-01-23	3	-0/+38
* \| \| \|	Merge pull request #30391 from jbourassa/fix-actionmailer-lambda-default	Ryuta Kamizono	2018-01-24	4	-2/+34
\|\ \ \ \
\| * \| \| \|	Fix AM::Base.default proc arity breaking change	Jimmy Bourassa	2017-08-29	4	-2/+33
* \| \| \| \|	Merge pull request #31750 from morygonzalez/consider-locale_selector-missing	Yuji Yaginuma	2018-01-23	1	-5/+16
\|\ \ \ \ \
\| * \| \| \| \|	Fix locale_selector JS bug in ActionMailer Preview	Hitoshi Nakashima	2018-01-23	1	-5/+16
* \| \| \| \| \|	Merge pull request #31487 from fatkodima/improve_cache_fault_tolerance	Rafael França	2018-01-22	5	-10/+137
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Improve fault tolerance for redis cache store	fatkodima	2018-01-23	5	-10/+137
\|/ / / / / /
* \| \| \| \| \|	Add missing require	George Claghorn	2018-01-22	1	-3/+5
* \| \| \| \| \|	Merge pull request #31765 from utilum/lang	Rafael França	2018-01-22	1	-1/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	remove text repetition	utilum	2018-01-22	1	-1/+1
* \| \| \| \| \| \|	Merge pull request #31447 from fatkodima/redis_cache-connection_pool	Rafael Mendonça França	2018-01-22	9	-74/+167
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Add support for connection pooling on RedisCacheStore	fatkodima	2018-01-22	9	-74/+167
* \| \| \| \| \| \|	Merge pull request #31763 from utilum/image_not_truncated	Rafael França	2018-01-22	1	-2/+1
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Update guide text not to contradict image	utilum	2018-01-22	1	-2/+1
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #31549 from fatkodima/foreign_tables	Ryuta Kamizono	2018-01-23	4	-1/+128
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Support for PostgreSQL foreign tables	fatkodima	2018-01-22	4	-1/+128
\| \|/ / / / / /
* / / / / / /	Fix building has_one through record	Ryuta Kamizono	2018-01-23	4	-14/+22
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #30535 from leonelgalan/becomes_and_default_inheritance	Ryuta Kamizono	2018-01-23	2	-1/+18
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Ignores a default subclass when `becomes(Parent)`	Leonel Galan	2018-01-22	2	-1/+18
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #24964 from vipulnsward/true-false	Matthew Draper	2018-01-23	1	-2/+2
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Dont perform unnecessary check with false, just use true/false values for @ac...	Vipul A M	2016-05-11	1	-2/+2
* \| \| \| \| \| \|	Merge pull request #31710 from eugeneius/indestructible_through_record	Ryuta Kamizono	2018-01-22	6	-5/+24
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Don't update counter cache when through record was not destroyed	Eugene Kenny	2018-01-14	6	-5/+24
* \| \| \| \| \| \| \|	Pass desired driver to Redis client constructor rather than munging global co...	George Claghorn	2018-01-21	1	-16/+12
* \| \| \| \| \| \| \|	Merge pull request #31753 from justjake/patch-1	George Claghorn	2018-01-21	1	-1/+1
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	bin/yarn: Pass through arguments with spaces	Jake Teton-Landis	2018-01-21	1	-1/+1
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #31757 from composerinteralia/define-attribute	Ryuta Kamizono	2018-01-22	1	-1/+1
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Use singular define_attribute_method	Daniel Colson	2018-01-21	1	-1/+1
\|/ / / / / / / /
* / / / / / / /	PERF: Recover `changes_applied` performance (#31698)	Ryuta Kamizono	2018-01-22	4	-75/+45
\|/ / / / / / /
* \| \| \| \| \| \|	Cope with videos with undefined display aspect ratios	George Claghorn	2018-01-20	3	-2/+15
* \| \| \| \| \| \|	Merge pull request #31641 from ckoenig/remove_frozen_string_literal	Yuji Yaginuma	2018-01-20	1	-4/+6
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Work on a dup'ed options hash	Christof Koenig	2018-01-09	1	-4/+6
* \| \| \| \| \| \| \|	More exercise `ActiveModel::Dirty` tests	Ryuta Kamizono	2018-01-20	1	-3/+24
* \| \| \| \| \| \| \|	Merge pull request #31749 from jameslovejoy/fix-documentation	Ryuta Kamizono	2018-01-20	2	-7/+7
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Fix typos. Improve text_helper documentation.	James Lovejoy	2018-01-19	2	-7/+7
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Use helper method	George Claghorn	2018-01-19	1	-1/+2
* \| \| \| \| \| \| \|	Preserve display aspect ratio for videos with rectangular samples	George Claghorn	2018-01-19	4	-19/+62
* \| \| \| \| \| \| \|	Merge pull request #31732 from koic/enable_autocorrect_for_lint_end_alignment...	Matthew Draper	2018-01-19	13	-15/+19
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Enable autocorrect for `Lint/EndAlignment` cop	Koichi ITO	2018-01-18	13	-15/+19
* \| \| \| \| \| \| \| \|	Remove unused `connection` argument from `MigrationContext#current_version`	Ryuta Kamizono	2018-01-19	1	-3/+3