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

	Commit message (Expand)	Author	Age	Files	Lines
*	Extract Firebird database tasks.	kennyj	2013-04-03	5	-20/+151
*	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
\| \|/ \|/\|
* \|	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	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	Anupam Choudhury	2013-04-02	6	-25/+37
\|/ /
* \|	Revert "Use jquery-rails from github"	Santiago Pastorino	2013-04-02	1	-3/+1
* \|	Revert "Use jquery-rails from github (fix Gem::Version error)"	Santiago Pastorino	2013-04-01	1	-1/+1
\|/
*	Merge pull request #10036 from wangjohn/norecord_error_message_consistency_is...	Rafael Mendonça França	2013-04-01	2	-3/+1
\|\
\| *	Updated the error message for +find+ on an inverse_of association	wangjohn	2013-04-01	2	-3/+1
\|/
*	Fix release task after ceb3b8717beb9818fbfbab429a8aa697591e184a	Santiago Pastorino	2013-04-01	3	-10/+27
*	Revert more Rails.version changes	Rafael Mendonça França	2013-04-01	4	-5/+5
*	Merge pull request #10022 from wangjohn/find_on_nonexistent_id_raises_error	Rafael Mendonça França	2013-04-01	3	-12/+55
\|\
\| *	Throwing a RecordNotFound exception when a record is scanned using the	wangjohn	2013-04-01	3	-12/+55
* \|	:scissors:	Rafael Mendonça França	2013-04-01	1	-4/+4
\|/
*	Merge pull request #10033 from kalabiyau/fix_typo_on_ap_mime_types_test	Rafael Mendonça França	2013-04-01	1	-1/+1
\|\
\| *	Fixed typo on AP dispatch Mime::Type test	KalabiYau	2013-04-01	1	-1/+1
* \|	Remove CHANGELOG entry for #10002	Rafael Mendonça França	2013-04-01	1	-4/+0
* \|	Merge pull request #10002 from charliesome/revert-version-method-on-rails	Jeremy Kemper	2013-04-01	3	-13/+16
\|\ \ \| \|/ \|/\|
\| *	reverts changes to Rails.version made in #8501	Charlie Somerville	2013-03-30	3	-13/+16
* \|	:uniq is still a valid relation option since it was only silently	Rafael Mendonça França	2013-04-01	1	-1/+1
* \|	Merge pull request #10031 from trevorturk/cookie-store-auto-upgrade-docs	Santiago Pastorino	2013-04-01	2	-23/+40
\|\ \
\| * \|	Improve documentation around the cookie store auto-upgrade to encryption	Trevor Turk	2013-04-01	2	-23/+40
* \| \|	Merge pull request #10010 from pwnall/fix_ref_index_true	Rafael Mendonça França	2013-04-01	1	-1/+1
\|\ \ \
\| * \| \|	Make references with index:true pass Hash options to add_index.	Victor Costan	2013-04-01	1	-1/+1
* \| \| \|	Move the class methods to above the protected section	Rafael Mendonça França	2013-04-01	3	-47/+36
* \| \| \|	Merge pull request #10021 from pabloh/refactor_rails_generator_test_case	Rafael Mendonça França	2013-04-01	4	-211/+259
\|\ \ \ \
\| * \| \| \|	Break down Rails::Generator::TestCase into modules	Pablo Herrero	2013-03-31	4	-211/+259
* \| \| \| \|	Merge pull request #10025 from masarakki/fix_detect_enum_column_on_mysql	Rafael Mendonça França	2013-04-01	5	-6/+6
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \|
\| * \| \| \|	fix detect column type of enum	masarakki	2013-04-01	5	-6/+6
\| \|/ / /
* \| \| \|	Merge pull request #9978 from trevorturk/cookie-store-auto-upgrade	Santiago Pastorino	2013-04-01	11	-99/+239
\|\ \ \ \
\| * \| \| \|	Allow transparent upgrading of legacy signed cookies to encrypted cookies; Au...	Trevor Turk	2013-03-28	11	-99/+239
* \| \| \| \|	Merge pull request #10026 from ogawaso/typo	Santiago Pastorino	2013-04-01	1	-2/+2
\|\ \ \ \ \
\| * \| \| \| \|	typo recomend -> recommend	ogawaso	2013-04-01	1	-2/+2
\|/ / / / /
* \| / / /	gist for Active Record issues [Neeraj Singh & Xavier Noria]	Xavier Noria	2013-04-01	3	-1/+90
\| \|/ / / \|/\| \| \|
* \| \| \|	Merge pull request #9680 from bdmac/time-zone-options-revert-grep-to-select	Carlos Antonio da Silva	2013-03-31	2	-4/+23
\|\ \ \ \
\| * \| \| \|	Add regression test for TZ grep	Brian McManus	2013-03-27	1	-0/+20
\| * \| \| \|	Revert grep to select since they are not the same	Brian McManus	2013-03-27	2	-4/+3
* \| \| \| \|	Merge pull request #10013 from vipulnsward/fix_request_method_test	Santiago Pastorino	2013-03-31	1	-6/+2
\|\ \ \ \ \
\| * \| \| \| \|	fix request methods test	Vipul A M	2013-03-31	1	-6/+2
\| \| \|_\|/ / \| \|/\| \| \|
* \| \| \| \|	Merge pull request #10017 from vipulnsward/railties_cleanups	Steve Klabnik	2013-03-31	3	-6/+5
\|\ \ \ \ \
\| * \| \| \| \|	cleanup railties test; fix typos	Vipul A M	2013-03-31	3	-6/+5
\| \|/ / / /
* \| \| \| \|	Merge pull request #10015 from vipulnsward/remove_unused_variable_in_get	Steve Klabnik	2013-03-31	2	-2/+2
\|\ \ \ \ \
\| * \| \| \| \|	remove unused variable and assignment	Vipul A M	2013-03-31	2	-2/+2
\| \|/ / / /