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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Per #9999 revert the revert changing so columns are only tested for empty? ↵	Sam	2013-04-03	2	-15/+29
\| \| \| \| \| \|	as opposed to blank? This is both faster and more correct, added tests to make sure this is not reverted again.
*	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
\| \| \| \| \|	Since it's not a real file any longer, no need to worry about removing it when we reset the dummy.
*	.gitkeep -> .keep	Steve Klabnik	2013-04-02	1	-0/+0
\| \| \| \|	Mentioned in a comment in e90c2d029edc by @frodsan.
*	Merge pull request #10061 from trevorturk/dummy-key-generator-rename	Santiago Pastorino	2013-04-02	8	-18/+18
\|\ \| \| \| \|	Rename DummyKeyGenerator -> LegacyKeyGenerator
\| *	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
\|\ \ \| \| \| \| \| \|	Cookies refactoring
\| * \|	: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
\| *	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
\| \| \| \| \|	I'm giving @jlsuttles credit on this commit because she gave me the idea and the actual converted image in 952289aabfb.
*	Merge pull request #10056 from steveklabnik/remove_rails_png	David Heinemeier Hansson	2013-04-02	3	-1/+1
\|\ \| \| \| \|	Remove rails.png.
\| *	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
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	No reason to have a file, we've got data-URIs now! It didn't make sense to me that you no longer have to remove public/index.html, but you still need to remove rails.png. This means that you won't have to any more when making a new Rails app.
* \|	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
\| * \|	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
\| *	each_with_index => each as we dont use index	Vipul A M	2013-04-03	1	-1/+1
\| \|
* \|	Merge pull request #10053 from ↵	Steve Klabnik	2013-04-02	1	-6/+30
\|\ \ \| \|/ \|/\| \| \| \| \|	wangjohn/change_docs_for_associations_distinctness Changed the guides for associations, warning about race conditions when checking for distinctness
\| *	Changed the guides to use distinct instead of uniq for associations (see	wangjohn	2013-04-02	1	-6/+30
\| \| \| \| \| \| \| \| \| \| \| \|	commit a1bb6c8b which changes the naming). I've also provided an example of how distinctness when inserting into an association can be achieved.
* \|	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
\| * \|	Turning on warnings in "rake test" for railties	Arun Agrawal	2013-04-01	1	-1/+1
\| \| \|
* \| \|	Merge pull request #9975 from ↵	Aaron Patterson	2013-04-02	2	-14/+20
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	mmangino/raise_when_attributes_cant_be_unserialized Unserializing YAML attributes can silently fail in development mode
\| * \| \|	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
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Extract Firebird / Sqlserver / Oracle database tasks, and They should be deprecated.
\| * \| \| \|	Add CHANGELOG entry about extracting and deprecating ↵	kennyj	2013-04-03	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Firebird/Sqlserver/Oracle database tasks.
\| * \| \| \|	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 ↵	kennyj	2013-04-03	3	-0/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	rails's testcases.
\| * \| \| \|	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
\| * \| \| \|	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
\| * \| \| \|	no need to invoke to_s before applying intern	Neeraj Singh	2013-04-02	1	-1/+1
\|/ / / /
* \| \| \|	Merge pull request #10048 from ↵	Rafael Mendonça França	2013-04-02	1	-17/+13
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	senny/replace_merge_with_relation_calls_in_count_api replace #merge with relation API calls in calculations_test.
\| * \| \| \|	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 regression re: #new with an STI object & complex inheritance
\| * \| \| \|	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
\| \|/ / / \|/\| \| \|
* \| \| \|	Merge pull request #10041 from vipulnsward/more_destructive_merge	Santiago Pastorino	2013-04-02	2	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	change merge to merge! in AS on new hashes
\| * \| \| \|	change merge to merge! in AS on new hashes	Vipul A M	2013-04-02	2	-2/+2
\| \| \| \| \|
* \| \| \| \|	Merge pull request #10042 from choudhuryanupam/fix_activesupport_test	Santiago Pastorino	2013-04-02	6	-25/+37
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|	Added missing assert
\| * \| \| \|	Added missing assert	Anupam Choudhury	2013-04-02	6	-25/+37
\|/ / / /
* \| \| \|	Revert "Use jquery-rails from github"	Santiago Pastorino	2013-04-02	1	-3/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 7a9a7007637b8279501770be03bd84ce83d61ab8. Conflicts: railties/lib/rails/generators/app_base.rb
* \| \| \|	Revert "Use jquery-rails from github (fix Gem::Version error)"	Santiago Pastorino	2013-04-01	1	-1/+1
\|/ / / \| \| \| \| \| \| \| \| \|	This reverts commit 6f3f0f86332004fcee5c2f05d52bbff08c22f980.