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

	Commit message (Expand)	Author	Age	Files	Lines
*	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
\| * \| \| \|	Show deprecated messages only when target database adapters defined	Yasuo Honda	2013-04-03	3	-3/+3
\| * \| \| \|	Fix tiny problem: change method order for consistency and fix wrong method name.	kennyj	2013-04-03	2	-2/+2
\| * \| \| \|	Suppress deprecation messages for deprecated database tasks, when executing r...	kennyj	2013-04-03	3	-0/+21
\| * \| \| \|	Add deprecation message on Firebird / Sqlserver / Oracle database tasks.	kennyj	2013-04-03	3	-0/+3
\| * \| \| \|	Extract Oracle database tasks.	kennyj	2013-04-03	5	-31/+140
\| * \| \| \|	Extract Sqlserver database tasks.	kennyj	2013-04-03	5	-11/+131
\| * \| \| \|	Extract Firebird database tasks.	kennyj	2013-04-03	5	-20/+151
* \| \| \| \|	Merge pull request #10052 from neerajdotname/stdout-in-log	Rafael Mendonça França	2013-04-02	2	-2/+6
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	write sql queries to terminal	Neeraj Singh	2013-04-02	2	-2/+6
* \| \| \| \|	Merge pull request #10050 from neerajdotname/no-need-of-to_s-before-intern	Rafael Mendonça França	2013-04-02	1	-1/+1
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	no need to invoke to_s before applying intern	Neeraj Singh	2013-04-02	1	-1/+1
\|/ / / /
* \| \| \|	Merge pull request #10048 from senny/replace_merge_with_relation_calls_in_cou...	Rafael Mendonça França	2013-04-02	1	-17/+13
\|\ \ \ \
\| * \| \| \|	replace #merge with relation API calls in calculations_test.	Yves Senn	2013-04-02	1	-17/+13
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge pull request #10038 from nateberkopec/sti-new-with-complex-inheritance	Rafael Mendonça França	2013-04-02	2	-1/+5
\|\ \ \ \
\| * \| \| \|	Fix #new with an STI object with complex inheritance	Nate Berkopec	2013-04-02	2	-1/+5
* \| \| \| \|	Use released sdoc	Santiago Pastorino	2013-04-02	1	-1/+1
\| \|/ / / \|/\| \| \|