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

	Commit message (Expand)	Author	Age	Files	Lines
*	add require to suppress warning; remove variable	Vipul A M	2013-04-04	2	-1/+2
*	Move changelog entry to the top and fix conflict [ci skip]	Carlos Antonio da Silva	2013-04-03	1	-22/+20
*	Merge pull request #9141 from adamgamble/issue-9091	David Heinemeier Hansson	2013-04-03	4	-0/+62
\|\
\| *	Modifies belong_to touch callback to touch old associations also #9091	Adam Gamble	2013-03-14	3	-10/+34
\| *	+ Add test for auto timestamps update of both old & new parent records	PikachuEXE	2013-03-14	2	-0/+38
* \|	Merge pull request #10049 from vipulnsward/optimize_around_merge_v1	Rafael Mendonça França	2013-04-03	1	-1/+1
\|\ \
\| * \|	optimize some code around merge	Vipul A M	2013-04-03	1	-1/+1
* \| \|	Merge pull request #10074 from trevorturk/remove-fixme-comments-about-legacy-...	Rafael Mendonça França	2013-04-03	6	-6/+0
\|\ \ \
\| * \| \|	Remove comments about removing LegacyKeyGenerator in 4.1	Trevor Turk	2013-04-03	6	-6/+0
* \| \| \|	Merge pull request #9932 from senny/9913_routing_problem	Andrew White	2013-04-03	2	-8/+41
\|\ \ \ \
\| * \| \| \|	routing shorthand syntax works with multiple paths	Yves Senn	2013-03-26	2	-5/+20
\| * \| \| \|	bugfix, when matching multiple paths with `get`, `post`, ...	Yves Senn	2013-03-26	2	-3/+21
* \| \| \| \|	Merge pull request #10070 from rubys/skip_bundle_in_railties_tests	Andrew White	2013-04-03	1	-1/+4
\|\ \ \ \ \
\| * \| \| \| \|	Avoid running bundler on tests that don't need it	Sam Ruby	2013-04-03	1	-1/+4
* \| \| \| \| \|	Merge pull request #10072 from senny/10071_format_on_scope_block_is_ignored	Andrew White	2013-04-03	2	-1/+23
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	fix regression in Mapper when `format:` was used in a `scope`.	Yves Senn	2013-04-03	2	-1/+23
* \| \| \| \| \|	Move alias method near to the aliased one in collection proxy	Carlos Antonio da Silva	2013-04-03	1	-2/+1
\|/ / / / /
* \| \| \| \|	Merge pull request #10064 from thenickcox/fix_grammatical_error	Steve Klabnik	2013-04-02	1	-2/+2
\|\ \ \ \ \
\| * \| \| \| \|	Fix grammatical error on JS helper warning message	thenickcox	2013-04-02	1	-2/+2
\|/ / / / /
* \| \| \| \|	Merge pull request #10063 from SamSaffron/master	Santiago Pastorino	2013-04-02	2	-15/+29
\|\ \ \ \ \
\| * \| \| \| \|	Per #9999 revert the revert changing so columns are only tested for empty? as...	Sam	2013-04-03	2	-15/+29
* \| \| \| \| \|	true/false => truthy falsy	Steve Klabnik	2013-04-02	1	-2/+2
* \| \| \| \| \|	Getting rid of a few other vestiges of rails.png.	Steve Klabnik	2013-04-02	3	-1/+0
\|/ / / / /
* \| \| \| \|	CHANGELOG entry for rails.png removal.	Steve Klabnik	2013-04-02	1	-0/+5
* \| \| \| \|	We don't need to remove index.html any more.	Steve Klabnik	2013-04-02	1	-1/+0
* \| \| \| \|	.gitkeep -> .keep	Steve Klabnik	2013-04-02	1	-0/+0
\| \|/ / / \|/\| \| \|
* \| \| \|	Merge pull request #10061 from trevorturk/dummy-key-generator-rename	Santiago Pastorino	2013-04-02	8	-18/+18
\|\ \ \ \
\| * \| \| \|	Rename DummyKeyGenerator -> LegacyKeyGenerator	Trevor Turk	2013-04-02	8	-18/+18
* \| \| \| \|	Merge pull request #10060 from trevorturk/cookies-refactoring	Jeremy Kemper	2013-04-02	1	-28/+25
\|\ \ \ \ \
\| * \| \| \| \|	:scissors: spacing after private	Trevor Turk	2013-04-02	1	-3/+0
\| * \| \| \| \|	Be consistent when talking about cookies, key -> name	Trevor Turk	2013-04-02	1	-25/+25
* \| \| \| \| \|	Merge pull request #10059 from trevorturk/perm-cookie-jar-fix	Steve Klabnik	2013-04-02	2	-2/+7
\|\\| \| \| \| \| \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Fix permanent cookie jar accessor typo	Trevor Turk	2013-04-02	2	-2/+7
\|/ / / /
* \| \| \|	Fix tests from rails.png removal.	Jessica Lynn Suttles	2013-04-02	1	-1/+8
* \| \| \|	Merge pull request #10056 from steveklabnik/remove_rails_png	David Heinemeier Hansson	2013-04-02	3	-1/+1
\|\ \ \ \
\| * \| \| \|	adding .gigkeep to default app/assets/images	Steve Klabnik	2013-04-02	1	-0/+0
\| * \| \| \|	Remove rails.png.	Steve Klabnik	2013-04-02	2	-1/+1
* \| \| \| \|	Merge pull request #10054 from rubys/use_find_by_in_rdoc	Santiago Pastorino	2013-04-02	10	-23/+23
\|\ \ \ \ \
\| * \| \| \| \|	Prefer find_by over dynamic finders in rdoc	Sam Ruby	2013-04-02	10	-23/+23
\| \|/ / / /
* \| \| \| \|	Merge pull request #10055 from vipulnsward/remove_each_with_index_in_test	Santiago Pastorino	2013-04-02	1	-1/+1
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	each_with_index => each as we dont use index	Vipul A M	2013-04-03	1	-1/+1
* \| \| \| \|	Merge pull request #10053 from wangjohn/change_docs_for_associations_distinct...	Steve Klabnik	2013-04-02	1	-6/+30
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Changed the guides to use distinct instead of uniq for associations (see	wangjohn	2013-04-02	1	-6/+30
* \| \| \| \|	Merge pull request #3782 from arunagw/warning_mode_on	Santiago Pastorino	2013-04-02	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	Turning on warnings in "rake test" for railties	Arun Agrawal	2013-04-01	1	-1/+1
* \| \| \| \| \|	Merge pull request #9975 from mmangino/raise_when_attributes_cant_be_unserial...	Aaron Patterson	2013-04-02	2	-14/+20
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Remove all error masking when decoding serialized data fails?	Mike Mangino	2013-04-02	2	-15/+12
\| * \| \| \| \| \|	Raise an exception when unserialization fails due to a missing class	Mike Mangino	2013-03-28	2	-1/+10
* \| \| \| \| \| \|	Merge pull request #9971 from kennyj/refactor_tasks	Rafael Mendonça França	2013-04-02	11	-61/+450
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Add CHANGELOG entry about extracting and deprecating Firebird/Sqlserver/Oracl...	kennyj	2013-04-03	1	-0/+5