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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #18779 from jduff/fix_documentation_typo	Abdelkader Boudih	2015-02-02	1	-1/+1
\|\
\| *	Fix typo in Time#change docs	John Duff	2015-02-02	1	-1/+1
\|/
*	Merge pull request #18612 from eileencodes/fix-validates-on-associated-record...	Aaron Patterson	2015-02-01	9	-5/+80
\|\
\| *	Fix validations on child record when record parent has validate: false	eileencodes	2015-02-01	9	-5/+80
\|/
*	Cache `url_helpers` separately for mailers	Andrew White	2015-02-01	1	-44/+50
*	Merge pull request #18776 from eileencodes/cache-url-helpers	Andrew White	2015-02-01	1	-42/+44
\|\
\| *	Cache `url_helpers`	eileencodes	2015-02-01	1	-42/+44
* \|	add destroyed records to the currend transaction	Aaron Patterson	2015-02-01	2	-1/+5
* \|	Fix Issue #15549, unbounded memory growth when saving records that have any a...	Will Bryant	2015-02-01	1	-2/+3
* \|	make the private methods private	Aaron Patterson	2015-02-01	1	-2/+2
* \|	push add to transaction logic down to the instance	Aaron Patterson	2015-02-01	3	-6/+10
* \|	remove conditional that is always true	Aaron Patterson	2015-02-01	1	-3/+2
* \|	stop making calls to add_record	Aaron Patterson	2015-02-01	1	-1/+1
* \|	Merge pull request #18770 from palkan/docs-hasone-dependent	Abdelkader Boudih	2015-02-01	1	-0/+4
\|\ \
\| * \|	[ci skip] add note about has_one :through and :dependent	palkan	2015-02-01	1	-0/+4
* \| \|	Merge pull request #18756 from ajgrover/activejob_tests	Matthew Draper	2015-02-01	1	-1/+1
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	Update queue_classic gem to use latest	Alex Grover	2015-01-31	1	-1/+1
* \| \|	Merge pull request #18721 from sj26/pre-discard-flash	Aaron Patterson	2015-02-01	4	-28/+51
\|\ \ \
\| * \| \|	Migrate old flash behaviour	Samuel Cochran	2015-01-30	2	-6/+13
\| * \| \|	Discard from flash before persisting in session	Samuel Cochran	2015-01-29	2	-24/+26
\| * \| \|	Fix flash remaining after last flash deleted	Samuel Cochran	2015-01-29	2	-0/+14
* \| \| \|	Merge pull request #18769 from gsamokovarov/exception-wrapper-windows-paths	Andrew White	2015-02-01	2	-2/+25
\|\ \ \ \
\| * \| \| \|	Show proper traces on Windows for the error pages	Genadi Samokovarov	2015-02-01	2	-2/+25
* \| \| \| \|	Merge branch 'master' into mdluo-master	Aaron Patterson	2015-02-01	29	-45/+45
\|\ \ \ \ \
\| * \| \| \| \|	Move required error message and changelog to Active Record	Carlos Antonio da Silva	2015-02-01	4	-7/+7
\| \| \|_\|_\|/ \| \|/\| \| \|
\| * \| \| \|	Merge pull request #18759 from yuki24/remove-warning	Yves Senn	2015-02-01	1	-3/+3
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| \|
\| \| * \| \|	:scissors: warning from controller renderer test	Yuki Nishijima	2015-01-31	1	-3/+3
\| * \| \| \|	Merge pull request #18767 from robertomiranda/ruby-2.2	Sean Griffin	2015-01-31	22	-32/+32
\| \|\ \ \ \
\| \| * \| \| \|	Use public Module#include, in favor of https://bugs.ruby-lang.org/issues/8846	robertomiranda	2015-01-31	22	-32/+32
\| * \| \| \| \|	Merge pull request #18763 from robertomiranda/ruby-2.2	Sean Griffin	2015-01-31	2	-3/+3
\| \|\\| \| \| \|
\| \| * \| \| \|	Use Module#include instead of send :include, since now is a public method [ci...	robertomiranda	2015-01-31	2	-3/+3
\| \|/ / / /
* \| \| \| \|	Merge pull request #1 from mdluo/pr/18316	Mingdong Luo	2015-01-31	3	-1/+18
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Merge branch 'master' into pr/18316	Mingdong Luo	2015-01-31	571	-4788/+7210
\| \|\ \ \ \ \| \|/ / / / \|/\| \| \| \|
* \| \| \| \|	Attribute assignment and type casting has nothing to do with columns	Sean Griffin	2015-01-31	15	-113/+153
* \| \| \| \|	Merge pull request #18760 from hjoo/fix_fixtures	Aaron Patterson	2015-01-31	1	-1/+2
\|\ \ \ \ \
\| * \| \| \| \|	changed deleted_tables list to set	Hyonjee Joo	2015-01-31	1	-1/+2
\|/ / / / /
* \| \| \| \|	Merge pull request #18512 from vipulnsward/18492-fixtures-with-sti	Aaron Patterson	2015-01-31	7	-12/+46
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|
\| * \| \| \|	Fixes #18492	Vipul A M	2015-01-14	7	-12/+46
* \| \| \| \|	Remove `AttributeSet#initialized_keys`	Sean Griffin	2015-01-31	2	-6/+2
* \| \| \| \|	Merge pull request #18700 from nygrenh/better-required-message	Aaron Patterson	2015-01-31	4	-3/+29
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \|
\| * \| \| \|	Provide a better error message on :required association	Henrik Nygren	2015-01-28	4	-3/+29
* \| \| \| \|	Merge pull request #18753 from andreynering/guide-single-table-inheritance	Robin Dupret	2015-01-31	2	-0/+68
\|\ \ \ \ \
\| * \| \| \| \|	Add Single Table Inheritance to guides [ci skip]	Andrey Nering	2015-01-31	2	-0/+68
* \| \| \| \| \|	Merge pull request #18540 from andreynering/guides-custom-form-builder	Robin Dupret	2015-01-31	1	-1/+8
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Improving 'Customizing Form Builder' section with example [ci skip]	Andrey Nering	2015-01-16	1	-1/+8
* \| \| \| \| \| \|	Merge pull request #18752 from vipulnsward/kwargs-av	Arthur Nogueira Neves	2015-01-31	3	-29/+29
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Fixed test for deprecation warning in actionview, renaming from https://githu...	Vipul A M	2015-01-31	3	-29/+29
* \| \| \| \| \| \| \|	Merge pull request #18749 from JuanitoFatas/doc/fix-type-in-deprecation	Andrew White	2015-01-31	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix a typo in deprecation warning. #process takes method instead of http_method.	Juanito Fatas	2015-01-31	1	-1/+1
* \| \| \| \| \| \| \|	fix kindlerb version [ci skip]	Xavier Noria	2015-01-31	1	-1/+1
\|/ / / / / / /